diff options
| author | Shea Levy <shea@shealevy.com> | 2013-02-21 11:13:30 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-02-21 11:13:30 -0500 |
| commit | acd4299e75a167a79521d76a1d312ca1cd8df92e (patch) | |
| tree | 4afeb7749025dabe55f3aa8f18a397384daa6595 /pkgs/build-support/kernel | |
| parent | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff) | |
| parent | 9cff61881d7391c92000eb83f94b515f763edbf9 (diff) | |
Merge branch 'master' into stdenv-updates
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
Diffstat (limited to 'pkgs/build-support/kernel')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 051989a096ee8..4ddf0706e03e1 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, cpio, contents, ubootChooser}: +{stdenv, perl, cpio, contents, ubootChooser, compressor}: let inputsFun = ubootName : [perl cpio] @@ -40,4 +40,5 @@ stdenv.mkDerivation { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; + inherit compressor; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index b2c7846356992..f6cadaf028190 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd) +(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz |