diff options
| author | Jorge Acereda <jacereda@gmail.com> | 2019-05-09 19:36:40 +0200 |
|---|---|---|
| committer | Jorge Acereda <jacereda@gmail.com> | 2019-05-09 19:44:34 +0200 |
| commit | b869a42ddb02a3ad6eb812a52400e0603b578bbb (patch) | |
| tree | ced6d7c3086e1a59acc2a8d9a9cc848f44a431c3 | |
| parent | ffmpeg-full: nvenc doesn't imply nonfree licensing (diff) | |
| download | nixpkgs-b869a42ddb02a3ad6eb812a52400e0603b578bbb.tar.gz | |
nvenc: remove obsolete nvidia-video-sdk
| -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 5bd699d67701..2b72950bf22e 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -96,7 +96,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support +, nvenc ? false # 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}"; @@ -417,7 +416,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] - ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] + ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration libiconv ]; |