diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-08-07 12:25:01 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2016-08-07 12:27:05 +0200 |
| commit | 00b05d47d30fff2ca1925ec38078907b95c6cb69 (patch) | |
| tree | 3d4215b8144923a47de3401eabbd38827d294604 | |
| parent | f7f8de64f49b14979efd2f6519f297dc5341d908 (diff) | |
| download | nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar.gz nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar.bz2 nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar.lz nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar.xz nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.tar.zst nixpkgs-00b05d47d30fff2ca1925ec38078907b95c6cb69.zip | |
ffmpeg: add extra darwin framework for 3.1
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.1.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index 25892e18684..84e6f57c523 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -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 ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0c4e9df3df1..33ee2f80a6e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a339dc08..714b68b8ed1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |