tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
Linux stdenv update: pass gnugrep to cc-wrapper
Anthony Cowley
10 years ago
5986aecc
d9689364
+8
-4
1 changed file
expand all
collapse all
unified
split
pkgs
stdenv
linux
default.nix
+8
-4
pkgs/stdenv/linux/default.nix
···
64
64
# the bootstrap. In all stages, we build an stdenv and the package
65
65
# set that can be built with that stdenv.
66
66
stageFun =
67
67
-
{gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
67
67
+
{gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
68
68
69
69
let
70
70
···
93
93
cc = gccPlain;
94
94
isGNU = true;
95
95
libc = glibc;
96
96
-
inherit binutils coreutils;
96
96
+
inherit binutils coreutils gnugrep;
97
97
name = name;
98
98
stdenv = stage0.stdenv;
99
99
};
···
125
125
glibc = null;
126
126
binutils = null;
127
127
coreutils = null;
128
128
+
gnugrep = null;
128
129
name = null;
129
130
130
131
overrides = pkgs: {
···
160
161
inherit (stage0.pkgs) glibc;
161
162
binutils = bootstrapTools;
162
163
coreutils = bootstrapTools;
164
164
+
gnugrep = bootstrapTools;
163
165
name = "bootstrap-gcc-wrapper";
164
166
165
167
# Rebuild binutils to use from stage2 onwards.
···
184
186
inherit (stage1.pkgs) glibc;
185
187
binutils = stage1.pkgs.binutils;
186
188
coreutils = bootstrapTools;
189
189
+
gnugrep = bootstrapTools;
187
190
name = "bootstrap-gcc-wrapper";
188
191
189
192
overrides = pkgs: {
···
200
203
gccPlain = bootstrapTools;
201
204
inherit (stage2.pkgs) glibc binutils;
202
205
coreutils = bootstrapTools;
206
206
+
gnugrep = bootstrapTools;
203
207
name = "bootstrap-gcc-wrapper";
204
208
205
209
overrides = pkgs: rec {
···
227
231
# Construct a fourth stdenv that uses the new GCC. But coreutils is
228
232
# still from the bootstrap tools.
229
233
stage4 = stageFun {
230
230
-
inherit (stage3.pkgs) gccPlain glibc binutils;
234
234
+
inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
231
235
coreutils = bootstrapTools;
232
236
name = "";
233
237
···
244
248
isGNU = true;
245
249
cc = stage4.stdenv.cc.cc;
246
250
libc = stage4.pkgs.glibc;
247
247
-
inherit (stage4.pkgs) binutils coreutils;
251
251
+
inherit (stage4.pkgs) binutils coreutils gnugrep;
248
252
name = "";
249
253
stdenv = stage4.stdenv;
250
254
shell = stage4.pkgs.bash + "/bin/bash";