mirror of https://github.com/materusPL/Nixerus.git
Compare commits
No commits in common. "14e31ce7591aae41102c8e417f3f0fb02700c126" and "8b8d4861b56f6e3c49cbd9253b255b92b19c3f68" have entirely different histories.
14e31ce759
...
8b8d4861b5
|
@ -9,9 +9,7 @@ rec {
|
|||
};
|
||||
|
||||
|
||||
ffmpeg6-amf-full = (if pkgs.lib.versionOlder pkgs.ffmpeg-full.version "6.1" then
|
||||
pkgs.callPackage ./apps/ffmpeg
|
||||
{
|
||||
ffmpeg6-amf-full = (if pkgs.lib.versionOlder pkgs.ffmpeg-full.version "6.1" then pkgs.callPackage ./apps/ffmpeg {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks)
|
||||
Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
|
||||
VideoDecodeAcceleration VideoToolbox;
|
||||
|
@ -33,5 +31,4 @@ rec {
|
|||
|
||||
lh2ctrl = callPackage ./apps/lh2ctrl.nix {};
|
||||
|
||||
emacs-materus = (pkgs.emacs29.override { withSQLite3 = true; withWebP = true; withX = true; withGTK3 = true; withAlsaLib = true; withGconf = true; withImageMagick = true; withXwidgets = true; });
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -22,7 +22,7 @@ def readPackages(packageString, packages,version):
|
|||
elif x[0] == "SHA256":
|
||||
packages[len(packages) - 1]["sha256"] = x[1].strip()
|
||||
|
||||
def generateFetchurl(version = "6.0.3", ubuntu_code = "jammy"):
|
||||
def generateFetchurl(version = "6.0.2", ubuntu_code = "jammy"):
|
||||
|
||||
packages = []
|
||||
packages32 = []
|
||||
|
|
Loading…
Reference in New Issue