materus
/
Nixerus
mirror of https://github.com/materusPL/Nixerus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: fix build on unstable, don't use custom file

This commit is contained in:
Mateusz Słodkowicz 2024-01-27 10:10:24 +01:00
parent f2175b39f1
commit 1d1741aceb
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/apps/ffmpeg/default.nix
View File

@ -1,4 +1,4 @@
import ./generic.nix rec { import ./old.nix rec {
version = "6.1"; version = "6.1";
sha256 = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; sha256 = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg=";
} }

0
pkgs/apps/ffmpeg/generic.nix → pkgs/apps/ffmpeg/old.nix
View File

10
pkgs/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, callPackage }: { pkgs, callPackage}:
rec { rec {
amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs { amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs {
vulkan = callPackage ./libs/amdgpu-pro-libs { }; 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) inherit (pkgs.darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
VideoDecodeAcceleration VideoToolbox; 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 {}; polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc {};