diff options
| author | jopejoe1 <johannes@joens.email> | 2024-01-16 23:21:38 +0100 |
|---|---|---|
| committer | jopejoe1 <johannes@joens.email> | 2024-01-27 12:47:28 +0100 |
| commit | 074566850e991865b60ce1810f10899570a3ffd6 (patch) | |
| tree | f21885436b0b8c470c7286db63415e0448a7c947 /pkgs/development/libraries/ffmpeg | |
| parent | e8d2916513a7cff6690f0057e857cbb167726351 (diff) | |
ffmpeg: move libdc1394 and libraw1394 to the right option
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b478bd7bd390b..6161ff687b7bc 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -564,10 +564,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] ++ optionals withCudaLLVM [ clang ]; - # TODO This was always in buildInputs before, why? - buildInputs = optionals withFullDeps [ libdc1394 ] - ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] + buildInputs = optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] ++ optionals withAribcaption [ libaribcaption ] @@ -578,6 +575,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] ++ optionals withDav1d [ dav1d ] + ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] ++ optionals withFdkAac [ fdk_aac ] ++ optionals withFontconfig [ fontconfig ] |