suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

I think this should fix the evaluation errors in hydra

Browse Source
This commit is contained in:
Daniel Peebles 2014-12-27 12:02:58 -05:00
parent 30f621944b
commit 8df8943b92
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/darwin/default.nix
View File

@ -18,7 +18,7 @@ import ../generic rec {
system = stdenv.system; system = stdenv.system;
gcc = import ../../build-support/gcc-wrapper { cc = import ../../build-support/gcc-wrapper {
nativeTools = false; nativeTools = false;
nativeLibc = true; nativeLibc = true;
inherit stdenv; inherit stdenv;
@ -34,8 +34,8 @@ import ../generic rec {
fetchurlBoot = stdenv.fetchurlBoot; fetchurlBoot = stdenv.fetchurlBoot;
overrides = pkgs_: { overrides = pkgs_: {
inherit gcc; inherit cc;
inherit (gcc) binutils; inherit (cc) binutils;
inherit (pkgs) inherit (pkgs)
gzip bzip2 xz bash coreutils diffutils findutils gawk gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi; gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi;

12
pkgs/stdenv/native/default.nix
View File

@ -73,7 +73,7 @@ rec {
# A function that builds a "native" stdenv (one that uses tools in # A function that builds a "native" stdenv (one that uses tools in
# /usr etc.). # /usr etc.).
makeStdenv = makeStdenv =
{ gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: { cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
import ../generic { import ../generic {
preHook = preHook =
@ -88,17 +88,17 @@ rec {
fetchurlBoot = fetchurl; fetchurlBoot = fetchurl;
inherit system shell gcc overrides config; inherit system shell cc overrides config;
}; };
stdenvBoot0 = makeStdenv { stdenvBoot0 = makeStdenv {
gcc = "/no-such-path"; cc = "/no-such-path";
fetchurl = null; fetchurl = null;
}; };
gcc = import ../../build-support/gcc-wrapper { cc = import ../../build-support/gcc-wrapper {
name = "gcc-native"; name = "gcc-native";
nativeTools = true; nativeTools = true;
nativeLibc = true; nativeLibc = true;
@ -116,7 +116,7 @@ rec {
# First build a stdenv based only on tools outside the store. # First build a stdenv based only on tools outside the store.
stdenvBoot1 = makeStdenv { stdenvBoot1 = makeStdenv {
inherit gcc fetchurl; inherit cc fetchurl;
} // {inherit fetchurl;}; } // {inherit fetchurl;};
stdenvBoot1Pkgs = allPackages { stdenvBoot1Pkgs = allPackages {
@ -129,7 +129,7 @@ rec {
# systems don't have, so we mustn't rely on the native environment # systems don't have, so we mustn't rely on the native environment
# providing it). # providing it).
stdenvBoot2 = makeStdenv { stdenvBoot2 = makeStdenv {
inherit gcc fetchurl; inherit cc fetchurl;
extraPath = [ stdenvBoot1Pkgs.xz ]; extraPath = [ stdenvBoot1Pkgs.xz ];
overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; }; overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
}; };