diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-10 16:44:34 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
commit | c9d8624ccddf17aee28745446b6763aabb26b4c7 (patch) | |
tree | e7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/development/libraries/ffmpeg | |
parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) |
treewide: Get rid of 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 ccdf4662719a5..ba59b0c16e6ff 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,7 +2,7 @@ , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d -, openglSupport ? false, libGLU_combined ? null +, openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null , libaomSupport ? false, libaom ? null # Build options @@ -63,7 +63,7 @@ let vpxSupport = reqMin "0.6" && !isAarch32; in -assert openglSupport -> libGLU_combined != null; +assert openglSupport -> libGL != null && libGLU != null; assert libmfxSupport -> intel-media-sdk != null; assert libaomSupport -> libaom != null; @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers - ] ++ optional openglSupport libGLU_combined + ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional vpxSupport libaom ++ optional vpxSupport libvpx |