diff options
| author | Jorge Acereda <jacereda@gmail.com> | 2019-02-08 10:50:43 +0000 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-05-11 11:38:25 +0200 |
| commit | de5e115de2d4fff8364097bef9a819b451b78958 (patch) | |
| tree | 4c2875a75cb9d3dbe28a7d1c83e4b1a021fdf7e3 /pkgs/development/libraries/ffmpeg-full | |
| parent | 5dff8e981887abdb2e19031015a052480d13dde2 (diff) | |
| download | nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar.gz nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar.bz2 nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar.lz nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar.xz nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.tar.zst nixpkgs-de5e115de2d4fff8364097bef9a819b451b78958.zip | |
ffmpeg-full: nvenc doesn't imply nonfree licensing
(cherry picked from commit ce211e68396e7cfe0897586ae38b0e5fb268f09b)
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 84d106638a2..59c74be0538 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -228,7 +228,7 @@ 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 && nonfreeLicensing; +assert nvenc -> nvidia-video-sdk != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; |