diff --git a/pkgs/apps/ffmpeg/default.nix b/pkgs/apps/ffmpeg/default.nix index 9188e39..d54ae6d 100644 --- a/pkgs/apps/ffmpeg/default.nix +++ b/pkgs/apps/ffmpeg/default.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./old.nix rec { version = "6.1"; sha256 = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; } \ No newline at end of file diff --git a/pkgs/apps/ffmpeg/generic.nix b/pkgs/apps/ffmpeg/old.nix similarity index 100% rename from pkgs/apps/ffmpeg/generic.nix rename to pkgs/apps/ffmpeg/old.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 26c689e..78843c2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage }: +{ pkgs, callPackage}: rec { amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs { vulkan = callPackage ./libs/amdgpu-pro-libs { }; @@ -9,13 +9,15 @@ rec { }; - ffmpeg6-amf-full = pkgs.callPackage ./apps/ffmpeg { + ffmpeg6-amf-full = (if 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; - }; + } else + (pkgs.ffmpeg-full.overrideAttrs (finalAttrs: previousAttrs: {configureFlags = previousAttrs.configureFlags ++ ["--enable-amf"]; buildInputs = previousAttrs.buildInputs ++ [pkgs.amf-headers]; })) + ); - obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef;}; + obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef; }; polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc {};