From de5e115de2d4fff8364097bef9a819b451b78958 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 8 Feb 2019 10:50:43 +0000 Subject: ffmpeg-full: nvenc doesn't imply nonfree licensing (cherry picked from commit ce211e68396e7cfe0897586ae38b0e5fb268f09b) --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/ffmpeg-full') 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}"; -- cgit 1.4.1