diff options
| author | Domen Kožar <domen@dev.si> | 2017-10-30 23:33:20 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-10-31 07:47:58 +0000 |
| commit | ea6a4068cf89444accdd079accfd7c26eff63e8a (patch) | |
| tree | fc40e32221781aa90428afa802d404e2c8f2ab6a | |
| parent | 5541a9c26fbcb2109f1018d9afcfcb0c060bae68 (diff) | |
| download | nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar.gz nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar.bz2 nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar.lz nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar.xz nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.tar.zst nixlib-ea6a4068cf89444accdd079accfd7c26eff63e8a.zip | |
darwin: build apple stuff in parallel
| -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; - }; } |