diff options
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 985f328a22d..4a05eab87bd 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -7,8 +7,8 @@ # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads -, sdlSupport ? !stdenv.isArm, SDL ? null, SDL2 ? null -, vdpauSupport ? !stdenv.isArm, libvdpau ? null +, sdlSupport ? !stdenv.isAarch32, SDL ? null, SDL2 ? null +, vdpauSupport ? !stdenv.isAarch32, libvdpau ? null # Developer options , debugDeveloper ? false , optimizationsDeveloper ? true @@ -42,7 +42,7 @@ */ let - inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isArm; + inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32; inherit (stdenv.lib) optional optionals enableFeature; cmpVer = builtins.compareVersions; @@ -55,9 +55,9 @@ let verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix; # 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; + disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg; - vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); + vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32); in assert openglSupport -> libGLU_combined != null; @@ -153,8 +153,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 && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau |