tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
makeInitrd: Use stdenvNoCC
Eelco Dolstra
6 years ago
328796d7
cae6db88
+9
-10
1 changed file
expand all
collapse all
unified
split
pkgs
build-support
kernel
make-initrd.nix
+9
-10
pkgs/build-support/kernel/make-initrd.nix
···
12
12
# `contents = {object = ...; symlink = /init;}' is a typical
13
13
# argument.
14
14
15
15
-
{ stdenv, perl, cpio, contents, ubootTools
15
15
+
{ stdenvNoCC, perl, cpio, contents, ubootTools
16
16
, name ? "initrd"
17
17
, compressor ? "gzip -9n"
18
18
, prepend ? []
19
19
, lib
20
20
}:
21
21
-
let
21
21
+
let
22
22
# !!! Move this into a public lib function, it is probably useful for others
23
23
-
toValidStoreName = x: with builtins;
23
23
+
toValidStoreName = x: with builtins;
24
24
lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
25
25
26
26
-
in stdenv.mkDerivation rec {
26
26
+
in stdenvNoCC.mkDerivation rec {
27
27
inherit name;
28
28
29
29
builder = ./make-initrd.sh;
30
30
31
31
-
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";
31
31
+
makeUInitrd = stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage";
32
32
33
33
nativeBuildInputs = [ perl cpio ]
34
34
-
++ stdenv.lib.optional makeUInitrd ubootTools;
34
34
+
++ stdenvNoCC.lib.optional makeUInitrd ubootTools;
35
35
36
36
# !!! should use XML.
37
37
objects = map (x: x.object) contents;
···
42
42
# Note: we don't use closureInfo yet, as that won't build with nix-1.x.
43
43
# See #36268.
44
44
exportReferencesGraph =
45
45
-
lib.zipListsWith
46
46
-
(x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
47
47
-
contents
45
45
+
lib.zipListsWith
46
46
+
(x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
47
47
+
contents
48
48
(lib.range 0 (lib.length contents - 1));
49
49
pathsFromGraph = ./paths-from-graph.pl;
50
50
51
51
inherit compressor prepend;
52
52
}
53
53
-