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

Partially revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"

Browse Source 
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
This commit is contained in:
obadz 2016-08-21 15:25:57 +01:00
parent 68936edfb3
commit 2a552a0888
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -1,6 +1,6 @@
{ pkgspath ? ../../.., test-pkgspath ? pkgspath }: { system ? builtins.currentSystem }:
with import pkgspath { system = builtins.currentSystem; }; with import ../../.. { inherit system; };
let let
llvmPackages = llvmPackages_38; 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 # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
test-pkgs = let test-pkgs = let
stdenv = import "${test-pkgspath}/pkgs/stdenv/darwin" { inherit system bootstrapFiles; }; stdenv = import ./. { inherit system bootstrapFiles; };
in import test-pkgspath { in import ../../.. {
inherit system; inherit system;
bootStdenv = stdenv.stdenvDarwin; bootStdenv = stdenv.stdenvDarwin;
}; };