dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ffmpeg: add extra darwin framework for 3.1

Browse Source
This commit is contained in:
Daiderd Jordan 2016-08-07 12:25:01 +02:00
parent f7f8de64f4
commit 00b05d47d3
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/3.1.nix
View File

@ -1,7 +1,12 @@
{ callPackage, ... } @ args: { callPackage
# Darwin frameworks
, Cocoa, CoreMedia
, ...
}@args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}.1"; version = "${branch}.1";
branch = "3.1"; branch = "3.1";
sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55"; sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
darwinFrameworks = [ Cocoa CoreMedia ];
}) })

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -13,7 +13,7 @@
, optimizationsDeveloper ? true , optimizationsDeveloper ? true
, extraWarningsDeveloper ? false , extraWarningsDeveloper ? false
# Darwin frameworks # Darwin frameworks
, Cocoa , Cocoa, darwinFrameworks ? [ Cocoa ]
# Inherit generics # Inherit generics
, branch, sha256, version, patches ? [], ... , branch, sha256, version, patches ? [], ...
}: }:
@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional ((isLinux || isFreeBSD) && !isArm) libva
++ optional isLinux alsaLib ++ optional isLinux alsaLib
++ optional isDarwin Cocoa ++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau ++ optional vdpauSupport libvdpau
++ optional sdlSupport SDL; ++ optional sdlSupport SDL;

2
pkgs/top-level/all-packages.nix
View File

@ -7172,7 +7172,7 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
}; };
# Aliases # Aliases
ffmpeg_0 = self.ffmpeg_0_10; ffmpeg_0 = self.ffmpeg_0_10;