diff options
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
-rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9d4369003e47d..12347318696c7 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -44,7 +44,6 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -73,6 +72,7 @@ , withRtmp ? false # RTMP[E] support , withSamba ? withFullDeps && !stdenv.isDarwin # Samba protocol , withSdl2 ? withSmallDeps +, withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withSoxr ? withHeadlessDeps # Resampling via soxr , withSpeex ? withHeadlessDeps # Speex de/encoder , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol @@ -189,7 +189,6 @@ , frei0r , fribidi , game-music-emu -, glslang , gnutls , gsm , intel-media-sdk @@ -213,6 +212,7 @@ , libopenmpt , libopus , libplacebo +, libplacebo_5 , libpulseaudio , libraw1394 , librsvg @@ -244,6 +244,7 @@ , rtmpdump , samba , SDL2 +, shaderc , soxr , speex , srt @@ -356,7 +357,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } ) - ++ (lib.optional (stdenv.isDarwin && lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; @@ -524,7 +525,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withZimg "libzimg") (enableFeature withZlib "zlib") (enableFeature withVulkan "vulkan") - (enableFeature withGlslang "libglslang") + (optionalString (lib.versionAtLeast version "5") (enableFeature withShaderc "libshaderc")) (enableFeature withSamba "libsmbclient") /* * Developer flags @@ -577,14 +578,13 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withFreetype [ freetype ] ++ optionals withFrei0r [ frei0r ] ++ optionals withFribidi [ fribidi ] - ++ optionals withGlslang [ glslang ] ++ optionals withGme [ game-music-emu ] ++ optionals withGnutls [ gnutls ] ++ optionals withGsm [ gsm ] ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] ++ optionals withLadspa [ ladspaH ] - ++ optionals withLibplacebo [ libplacebo vulkan-headers ] + ++ optionals withLibplacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] @@ -604,6 +604,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withRtmp [ rtmpdump ] ++ optionals withSamba [ samba ] ++ optionals withSdl2 [ SDL2 ] + ++ optionals withShaderc [ shaderc ] ++ optionals withSoxr [ soxr ] ++ optionals withSpeex [ speex ] ++ optionals withSrt [ srt ] |