Compare commits

...

2 Commits

3 changed files with 311 additions and 308 deletions

View File

@ -9,7 +9,9 @@ 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) inherit (pkgs.darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
VideoDecodeAcceleration VideoToolbox; VideoDecodeAcceleration VideoToolbox;
@ -31,4 +33,5 @@ rec {
lh2ctrl = callPackage ./apps/lh2ctrl.nix { }; 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

View File

@ -22,7 +22,7 @@ def readPackages(packageString, packages,version):
elif x[0] == "SHA256": elif x[0] == "SHA256":
packages[len(packages) - 1]["sha256"] = x[1].strip() packages[len(packages) - 1]["sha256"] = x[1].strip()
def generateFetchurl(version = "6.0.2", ubuntu_code = "jammy"): def generateFetchurl(version = "6.0.3", ubuntu_code = "jammy"):
packages = [] packages = []
packages32 = [] packages32 = []