diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
| commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
| tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/libraries/ffmpeg | |
| parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
| download | nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip | |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 906a15c419d6..985f328a22dd 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -3,7 +3,7 @@ , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus , hostPlatform -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads @@ -60,7 +60,7 @@ let vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus - ] ++ optional openglSupport mesa + ] ++ optional openglSupport libGLU_combined ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional isLinux alsaLib |