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

Porting changes from stdenv-updates into this branch.

Browse Source 
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
This commit is contained in:
Lluís Batlle i Rossell
2009-11-08 00:32:12 +00:00
parent 6e86ca940f
commit 4b27d28701
63 changed files with 3088 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/kernel/make-initrd.nix
+7 -2
View File
@@ -12,12 +12,17 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
{stdenv, perl, cpio, contents}:
{stdenv, perl, cpio, contents, uboot ? null}:
assert stdenv.system == "armv5tel-linux" -> uboot != null;
stdenv.mkDerivation {
name = "initrd";
builder = ./make-initrd.sh;
buildInputs = [perl cpio];
buildInputs = [perl cpio]
++ stdenv.lib.optional (stdenv.system == "armv5tel-linux") [ uboot ];
makeUInitrd = if (stdenv.system == "armv5tel-linux") then true else false;
# !!! should use XML.
objects = map (x: x.object) contents;