From 2d2a3dcffb267a1a594c0890d79d1ffb88e23d99 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Fri, 21 Jun 2019 23:04:23 -0400 Subject: [PATCH] ffmpeg-full: Fix on Darwin (PR #63643) --- pkgs/development/libraries/ffmpeg-full/default.nix | 8 ++++++-- 1 file 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 @@ -189,6 +189,10 @@ assert nonfreeLicensing -> gplLicensing && version3Licensing; */ assert networkBuild -> gnutls != null || opensslExtlib; assert pixelutilsBuild -> avutilLibrary; +/* + * Platform dependencies + */ +assert isDarwin -> !nvenc; /* * Program dependencies */