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

darwin: ffmpeg: add needed inputs

Browse Source
This commit is contained in:
Asko Soukka 2015-10-29 15:15:42 +02:00 committed by Jude Taylor
parent 75aadaeef7
commit aa12640cb9
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,8 @@
, debugDeveloper ? false
, optimizationsDeveloper ? true
, extraWarningsDeveloper ? false
# Darwin frameworks
, Cocoa
# Inherit generics
, branch, sha256, version, ...
}:
@ -141,7 +143,8 @@ stdenv.mkDerivation rec {
] ++ optional openglSupport mesa
++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin
++ optional (isLinux || isFreeBSD) libva
++ optional isLinux alsaLib;
++ optional isLinux alsaLib
++ optionals isDarwin [ Cocoa ];
enableParallelBuilding = true;

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

@ -6227,11 +6227,21 @@ let
fcgi = callPackage ../development/libraries/fcgi { };
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix { };
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
# Aliases
ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2;