diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
| commit | 620c147ccee09d7d068fa21b2b5b94b6695993a5 (patch) | |
| tree | 8bfa9b076f2712ba0318c986dcf80749e281db2d /pkgs/stdenv | |
| parent | 85628148de308b96744986f44ef0d05807125082 (diff) | |
| parent | c23b0856fda476df6aa58bcded9de6bdbeefdaed (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f2a482e3db2e3..c0c19a64c3c71 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -95,7 +95,7 @@ in rec { stdenvSandboxProfile = binShClosure + libSystemProfile; extraSandboxProfile = binShClosure + libSystemProfile; - extraAttrs = { inherit platform; }; + extraAttrs = { inherit platform; parent = last; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -290,6 +290,7 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; + parent = stage4; }; allowedRequisites = (with pkgs; [ |