diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-07-15 09:39:03 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-07-15 09:39:03 +0200 |
commit | 3686036e022617dc388fe04974fd82c3c533a71c (patch) | |
tree | 37b9cf7954b7675c04a8477316a2560c26d5032f /pkgs/development/libraries/ffmpeg-full | |
parent | 442fd85db6848444c51ad498f49ca2c563ebf3aa (diff) | |
parent | eadc851051479c23ffaabe6b18d7aea8dac20001 (diff) |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1530372
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 e16aee9f5ca05..db6793df646b2 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 |