diff options
| author | Jorge Acereda <jacereda@gmail.com> | 2019-05-09 19:36:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-05-11 11:38:26 +0200 |
| commit | f96ce31af828e16df1a569c345f39951d1aa5091 (patch) | |
| tree | 21dac17d8720cce38edeb69ef2277387a2c247bd /pkgs/development/libraries/ffmpeg-full | |
| parent | de5e115de2d4fff8364097bef9a819b451b78958 (diff) | |
| download | nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar.gz nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar.bz2 nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar.lz nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar.xz nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.tar.zst nixpkgs-f96ce31af828e16df1a569c345f39951d1aa5091.zip | |
nvenc: remove obsolete nvidia-video-sdk
(cherry picked from commit b869a42ddb02a3ad6eb812a52400e0603b578bbb)
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 59c74be0538..ca0a250e3d4 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -97,7 +97,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? false, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -228,7 +228,6 @@ assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; -assert nvenc -> nvidia-video-sdk != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; @@ -418,7 +417,7 @@ stdenv.mkDerivation rec { ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optional (isLinux && libmfx != null) libmfx - ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] + ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; |