diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-10-31 11:16:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 11:16:38 +0100 |
| commit | dc1ef6ce8c7605c9b06fda866d86520a3d4463d1 (patch) | |
| tree | fa0688e1c73362179d54cd80b4cac933e1320433 /pkgs | |
| parent | 2d403e668cbf99cbf23d157639c0d598f4660670 (diff) | |
| parent | ea6a4068cf89444accdd079accfd7c26eff63e8a (diff) | |
| download | nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar.gz nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar.bz2 nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar.lz nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar.xz nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.tar.zst nixlib-dc1ef6ce8c7605c9b06fda866d86520a3d4463d1.zip | |
Merge pull request #31013 from NixOS/darwin-parallel
darwin: build applle stuff in parallel
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 0e8389948870..965632b5788d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -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_; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index fd0d00d81cfb..0ce9c54e48c4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,8 +127,4 @@ appleDerivation { mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; - - meta = { - platforms = stdenv.lib.platforms.darwin; - }; } |