I think this should fix the evaluation errors in hydra
This commit is contained in:
parent
30f621944b
commit
8df8943b92
|
@ -18,7 +18,7 @@ import ../generic rec {
|
|||
|
||||
system = stdenv.system;
|
||||
|
||||
gcc = import ../../build-support/gcc-wrapper {
|
||||
cc = import ../../build-support/gcc-wrapper {
|
||||
nativeTools = false;
|
||||
nativeLibc = true;
|
||||
inherit stdenv;
|
||||
|
@ -34,8 +34,8 @@ import ../generic rec {
|
|||
fetchurlBoot = stdenv.fetchurlBoot;
|
||||
|
||||
overrides = pkgs_: {
|
||||
inherit gcc;
|
||||
inherit (gcc) binutils;
|
||||
inherit cc;
|
||||
inherit (cc) binutils;
|
||||
inherit (pkgs)
|
||||
gzip bzip2 xz bash coreutils diffutils findutils gawk
|
||||
gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi;
|
||||
|
|
|
@ -73,7 +73,7 @@ rec {
|
|||
# A function that builds a "native" stdenv (one that uses tools in
|
||||
# /usr etc.).
|
||||
makeStdenv =
|
||||
{ gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
|
||||
{ cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
|
||||
|
||||
import ../generic {
|
||||
preHook =
|
||||
|
@ -88,17 +88,17 @@ rec {
|
|||
|
||||
fetchurlBoot = fetchurl;
|
||||
|
||||
inherit system shell gcc overrides config;
|
||||
inherit system shell cc overrides config;
|
||||
};
|
||||
|
||||
|
||||
stdenvBoot0 = makeStdenv {
|
||||
gcc = "/no-such-path";
|
||||
cc = "/no-such-path";
|
||||
fetchurl = null;
|
||||
};
|
||||
|
||||
|
||||
gcc = import ../../build-support/gcc-wrapper {
|
||||
cc = import ../../build-support/gcc-wrapper {
|
||||
name = "gcc-native";
|
||||
nativeTools = true;
|
||||
nativeLibc = true;
|
||||
|
@ -116,7 +116,7 @@ rec {
|
|||
|
||||
# First build a stdenv based only on tools outside the store.
|
||||
stdenvBoot1 = makeStdenv {
|
||||
inherit gcc fetchurl;
|
||||
inherit cc fetchurl;
|
||||
} // {inherit fetchurl;};
|
||||
|
||||
stdenvBoot1Pkgs = allPackages {
|
||||
|
@ -129,7 +129,7 @@ rec {
|
|||
# systems don't have, so we mustn't rely on the native environment
|
||||
# providing it).
|
||||
stdenvBoot2 = makeStdenv {
|
||||
inherit gcc fetchurl;
|
||||
inherit cc fetchurl;
|
||||
extraPath = [ stdenvBoot1Pkgs.xz ];
|
||||
overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue