diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 10:47:24 +0000 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-14 14:45:48 +0000 |
| commit | f38a57f07241c01dbba370e5b718e24169741f17 (patch) | |
| tree | f4b7a62b369242c4849d214b2526c2d9ee9233b8 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | 4aabca33a16f0467e428b04c0ce2dd038f43671e (diff) | |
| download | nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar.gz nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar.bz2 nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar.lz nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar.xz nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.tar.zst nixpkgs-f38a57f07241c01dbba370e5b718e24169741f17.zip | |
ffmpeg-full: fix cross
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index afd67d19637..bbdf154c6a2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -545,7 +545,8 @@ stdenv.mkDerivation (finalAttrs: { in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; - nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] + ++ optionals withCudaLLVM [ clang ]; # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] @@ -559,7 +560,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] - ++ optionals withCudaLLVM [ clang ] ++ optionals withDav1d [ dav1d ] ++ optionals withDrm [ libdrm ] ++ optionals withFdkAac [ fdk_aac ] |