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

make-initrd: Don't use stdenv.cross

Browse Source
This commit is contained in:
John Ericson 2017-06-26 18:58:21 -04:00
parent 9c163cebdd
commit deb8fae4c0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/kernel/make-initrd.nix
View File

@ -12,7 +12,9 @@
# `contents = {object = ...; symlink = /init;}' is a typical # `contents = {object = ...; symlink = /init;}' is a typical
# argument. # argument.
{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }: { stdenv, perl, cpio, contents, ubootChooser, compressor, prepend
, hostPlatform
}:
let let
inputsFun = ubootName : [ perl cpio ] inputsFun = ubootName : [ perl cpio ]
@ -22,9 +24,9 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "initrd"; name = "initrd";
builder = ./make-initrd.sh; builder = ./make-initrd.sh;
nativeBuildInputs = inputsFun stdenv.platform.uboot; nativeBuildInputs = inputsFun hostPlatform.platform.uboot;
makeUInitrd = makeUInitrdFun stdenv.platform.uboot; makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot;
# !!! should use XML. # !!! should use XML.
objects = map (x: x.object) contents; objects = map (x: x.object) contents;
@ -36,9 +38,5 @@ stdenv.mkDerivation {
map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
pathsFromGraph = ./paths-from-graph.pl; pathsFromGraph = ./paths-from-graph.pl;
crossAttrs = {
nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
};
inherit compressor prepend; inherit compressor prepend;
} }