From be2ff2328071f7c8821fc2dce25f1580b02511d2 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 8 Nov 2009 18:47:55 +0000 Subject: Making the 'makeInitrd' expression use "platform" svn path=/nixpkgs/branches/stdenv-updates/; revision=18292 --- pkgs/build-support/kernel/make-initrd.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/build-support/kernel') diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 92142b5ef43e..962685776962 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,17 +12,15 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, cpio, contents, uboot ? null}: - -assert stdenv.system == "armv5tel-linux" -> uboot != null; +{stdenv, perl, cpio, contents, platform}: stdenv.mkDerivation { name = "initrd"; builder = ./make-initrd.sh; buildInputs = [perl cpio] - ++ stdenv.lib.optional (stdenv.system == "armv5tel-linux") [ uboot ]; + ++ stdenv.lib.optional (platform.uboot != null) [ platform.uboot ]; - makeUInitrd = if (stdenv.system == "armv5tel-linux") then true else false; + makeUInitrd = if (platform.uboot != null) then true else false; # !!! should use XML. objects = map (x: x.object) contents; -- cgit 1.4.1