diff options
author | obadz <obadz-git@obadz.com> | 2016-08-21 15:25:57 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-21 15:26:51 +0100 |
commit | 2a552a0888808b8b66a8c7e241462f9a0353e664 (patch) | |
tree | 71baf29f4cbb931783128f29d788d15293dce1d3 /pkgs/stdenv/darwin | |
parent | 68936edfb3142b0e308ff8428e1c19d6bcd30843 (diff) | |
download | nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar.gz nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar.bz2 nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar.lz nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar.xz nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.tar.zst nixlib-2a552a0888808b8b66a8c7e241462f9a0353e664.zip |
Partially revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"
This partially reverts commit bddf4e21801d0629b608a8a0a46830c795e35ba4. cc @copumpkin Was breaking nix-build <nixpkgs/nixos/release-combined.nix> -A nixpkgs.tarball See http://hydra.nixos.org/build/38886695/nixlog/2
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 83e04bb3339a..0216acee659b 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,6 +1,6 @@ -{ pkgspath ? ../../.., test-pkgspath ? pkgspath }: +{ system ? builtins.currentSystem }: -with import pkgspath { system = builtins.currentSystem; }; +with import ../../.. { inherit system; }; let llvmPackages = llvmPackages_38; @@ -297,8 +297,8 @@ in rec { # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it test-pkgs = let - stdenv = import "${test-pkgspath}/pkgs/stdenv/darwin" { inherit system bootstrapFiles; }; - in import test-pkgspath { + stdenv = import ./. { inherit system bootstrapFiles; }; + in import ../../.. { inherit system; bootStdenv = stdenv.stdenvDarwin; }; |