diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-05-19 01:59:44 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-05-19 02:29:49 +0300 |
| commit | 6679dbbd60d2c04865411458b49a1d85eb99d461 (patch) | |
| tree | 2b21ee92df25f85b1bf87aa42bb02d439063e601 /pkgs/development/libraries/ffmpeg | |
| parent | c5a9ad1880bcf933794149d07559a264e8dacaa7 (diff) | |
| download | nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar.gz nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar.bz2 nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar.lz nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar.xz nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.tar.zst nixlib-6679dbbd60d2c04865411458b49a1d85eb99d461.zip | |
ffmpeg: fix arm build
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 8c74abc57094..57ac086368f4 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -55,6 +55,8 @@ let # Disable dependency that needs fixes before it will work on Darwin or Arm disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg; + + vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in assert openglSupport -> mesa != null; @@ -121,7 +123,7 @@ stdenv.mkDerivation rec { "--enable-libmp3lame" (ifMinVer "1.2" "--enable-iconv") "--enable-libtheora" - (ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi")) + (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") @@ -197,8 +199,7 @@ stdenv.mkDerivation rec { installFlags = [ "install-man" ]; passthru = { - vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false; - inherit vdpauSupport; + inherit vaapiSupport vdpauSupport; }; meta = with stdenv.lib; { |