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-full | |
| parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
| download | nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip | |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 689b13a394d..67e364715f0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -102,7 +102,7 @@ #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering -, openglExtlib ? false, mesa ? null # OpenGL rendering +, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null @@ -225,7 +225,7 @@ assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> mesa != null; +assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; @@ -406,7 +406,7 @@ stdenv.mkDerivation rec { libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ] ++ optional openglExtlib mesa + ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] |