ffmpeg: add extra darwin framework for 3.1
This commit is contained in:
parent
f7f8de64f4
commit
00b05d47d3
@ -1,7 +1,12 @@
|
||||
{ callPackage, ... } @ args:
|
||||
{ callPackage
|
||||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.1";
|
||||
branch = "3.1";
|
||||
sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
})
|
||||
|
@ -13,7 +13,7 @@
|
||||
, optimizationsDeveloper ? true
|
||||
, extraWarningsDeveloper ? false
|
||||
# Darwin frameworks
|
||||
, Cocoa
|
||||
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
||||
# Inherit generics
|
||||
, branch, sha256, version, patches ? [], ...
|
||||
}:
|
||||
@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
|
||||
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
|
||||
++ optional ((isLinux || isFreeBSD) && !isArm) libva
|
||||
++ optional isLinux alsaLib
|
||||
++ optional isDarwin Cocoa
|
||||
++ optionals isDarwin darwinFrameworks
|
||||
++ optional vdpauSupport libvdpau
|
||||
++ optional sdlSupport SDL;
|
||||
|
||||
|
@ -7172,7 +7172,7 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
|
||||
};
|
||||
# Aliases
|
||||
ffmpeg_0 = self.ffmpeg_0_10;
|
||||
|
Loading…
Reference in New Issue
Block a user