diff options
| author | Benjamin Esham <benjamin@esham.io> | 2019-06-21 23:04:23 -0400 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-13 15:21:18 +0200 |
| commit | 2d2a3dcffb267a1a594c0890d79d1ffb88e23d99 (patch) | |
| tree | deca69c19cac6b10bf4068d3e035b17d99673a60 /pkgs/development/libraries/ffmpeg-full | |
| parent | 2f746bc1fcdc24b103bda3a27ed82c23200cc077 (diff) | |
ffmpeg-full: Fix on Darwin (PR #63643)
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index db606cc02d63..e3517a46e44c 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 ? true, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder @@ -175,7 +175,7 @@ */ let - inherit (stdenv) isCygwin isFreeBSD isLinux; + inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; in @@ -190,6 +190,10 @@ assert nonfreeLicensing -> gplLicensing && version3Licensing; assert networkBuild -> gnutls != null || opensslExtlib; assert pixelutilsBuild -> avutilLibrary; /* + * Platform dependencies + */ +assert isDarwin -> !nvenc; +/* * Program dependencies */ assert ffmpegProgram -> avcodecLibrary |