public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg-full: Fix on Darwin (PR #63643)

Browse Source
This commit is contained in:
Benjamin Esham 2019-06-21 23:04:23 -04:00 committed by Vladimír Čunát
parent 2f746bc1fc
commit 2d2a3dcffb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -97,7 +97,7 @@
, libXv ? null # Xlib support , libXv ? null # Xlib support
, libXext ? null # Xlib support , libXext ? null # Xlib support
, lzma ? null # xz-utils , 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 , openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
@ -175,7 +175,7 @@
*/ */
let let
inherit (stdenv) isCygwin isFreeBSD isLinux; inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux;
inherit (stdenv.lib) optional optionals optionalString enableFeature; inherit (stdenv.lib) optional optionals optionalString enableFeature;
in in
@ -189,6 +189,10 @@ assert nonfreeLicensing -> gplLicensing && version3Licensing;
*/ */
assert networkBuild -> gnutls != null || opensslExtlib; assert networkBuild -> gnutls != null || opensslExtlib;
assert pixelutilsBuild -> avutilLibrary; assert pixelutilsBuild -> avutilLibrary;
/*
* Platform dependencies
*/
assert isDarwin -> !nvenc;
/* /*
* Program dependencies * Program dependencies
*/ */