alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing the evaluation of the linux kernel (= /= ==)

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19138
This commit is contained in:
Lluís Batlle i Rossell 2009-12-28 11:26:23 +00:00
parent 1452ce46a4
commit d5aa5641de
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -73,8 +73,8 @@ stdenv.mkDerivation {
map ({extraConfig ? "", ...}: extraConfig) kernelPatches; map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
in lib.concatStringsSep "\n" ([config] ++ configFromPatches); in lib.concatStringsSep "\n" ([config] ++ configFromPatches);
# For UML, just ignore all options that don't apply (I'm lazy). # For UML and non-PC, just ignore all options that don't apply (We are lazy).
ignoreConfigErrors = (userModeLinux || stdenv.system = "armv5tel-linux"); ignoreConfigErrors = (userModeLinux || stdenv.system == "armv5tel-linux");
buildInputs = [ perl mktemp ] buildInputs = [ perl mktemp ]
++ lib.optional (platform.uboot != null) [platform.uboot]; ++ lib.optional (platform.uboot != null) [platform.uboot];