diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
| commit | 70babe5bcf383629a6adff3f2874d1b661462146 (patch) | |
| tree | dfbbfa66d02e6ea8fd2d691defcd2307e8f9f16f /pkgs/development/libraries/ffmpeg-full/default.nix | |
| parent | 52cd3538ff0214f0416455322cec299d2a43a436 (diff) | |
| parent | c04a14edd6096a2d55d3b62ca182739dac9b7ede (diff) | |
| download | nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.gz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.bz2 nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.lz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.xz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.zst nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full/default.nix')
| -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 a09ad0e871e..d861d25e67a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -99,7 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support -, lzma ? null # xz-utils +, xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -381,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (lzma != null) "lzma") + (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") @@ -431,7 +431,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] |