diff options
| author | Will Dietz <w@wdtz.org> | 2018-12-17 09:48:54 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-12-28 13:06:20 -0600 |
| commit | 8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72 (patch) | |
| tree | 4690bdbc0929c7780f89f4562676601abf5e6a37 /pkgs/development/libraries/ffmpeg-full | |
| parent | 2420e969905ff1afccef94745055f2a4d7cefa04 (diff) | |
| download | nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar.gz nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar.bz2 nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar.lz nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar.xz nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.tar.zst nixpkgs-8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72.zip | |
ffmpeg-full: added missing libXext dep, needed for 'xlib' support
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6ec08e1111f..d20d7a9e6b2 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,6 +95,7 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers @@ -357,7 +358,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -410,7 +411,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib libGLU_combined |