diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 18:51:06 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 18:51:06 +0000 |
| commit | 3b747e92e5e300df5635b2f6d788a9c13ec15bde (patch) | |
| tree | af225f8cbcd4e9e153b5c49a6073c5cb197dc475 /pkgs/build-support/kernel | |
| parent | 11aa65c28a819db3a2142884f86fa6a8efdea640 (diff) | |
| download | nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar.gz nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar.bz2 nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar.lz nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar.xz nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.tar.zst nixpkgs-3b747e92e5e300df5635b2f6d788a9c13ec15bde.zip | |
Fixing the correct handling of uboot in the initrd and the kernel derivations.
(nixos on sheevaplug) svn path=/nixpkgs/trunk/; revision=20275
Diffstat (limited to 'pkgs/build-support/kernel')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index f2cf894b863..2c0ca37553d 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -16,7 +16,7 @@ let inputsFun = ubootName : [perl cpio] - ++ stdenv.lib.optional (ubootName != null) [ ubootChooser ubootName ]; + ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ]; makeUInitrdFun = ubootName : (ubootName != null); in stdenv.mkDerivation { |