diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
| commit | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (patch) | |
| tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| parent | 12949bf84ab06bebb854a07082bf5c32f5e14892 (diff) | |
| download | nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.gz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.bz2 nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.lz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.xz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.zst nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index bc70c5ab2371..3d9027db1602 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -26,7 +26,7 @@ * see `ffmpeg-full' for an ffmpeg build with all features included. * * Need fixes to support Darwin: - * libvpx pulseaudio + * pulseaudio * * Known issues: * 0.6 - fails to compile (unresolved) (so far, only disabling a number of @@ -58,6 +58,8 @@ let disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg; vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32); + + vpxSupport = reqMin "0.6" && !isAarch32; in assert openglSupport -> libGLU_combined != null; @@ -130,7 +132,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" - (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") + (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) (ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.2" (enableFeature openglSupport "opengl")) (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") @@ -159,7 +161,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional vpxSupport libvpx + ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks |