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

Merge pull request #31013 from NixOS/darwin-parallel

Browse Source 
darwin: build applle stuff in parallel
This commit is contained in:
Daniel Peebles 2017-10-31 11:16:38 +01:00 committed by GitHub
commit dc1ef6ce8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/darwin/apple-source-releases/default.nix
View File

@ -144,6 +144,10 @@ let
appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({
inherit version;
name = "${name}-${version}";
enableParallelBuilding = true;
meta = {
platforms = stdenv.lib.platforms.darwin;
};
} // (if attrs ? srcs then {} else {
src = fetchApple version sha256 name;
}) // attrs);
@ -153,7 +157,7 @@ let
name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0;
appleDerivation = appleDerivation_ name version sha256;
callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; });
in callPackage (./. + builtins.toPath "/${namePath}");
in callPackage (./. + "/${namePath}");
libsecPackage = pkgs.callPackage ./libsecurity_generic {
inherit applePackage appleDerivation_;

4
pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
View File

@ -127,8 +127,4 @@ appleDerivation {
mkdir $out/Library/PrivateFrameworks
mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks
'';
meta = {
platforms = stdenv.lib.platforms.darwin;
};
}