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

* Doh.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9565
This commit is contained in:
Eelco Dolstra 2007-10-31 15:54:31 +00:00
parent 3b7a9dfa1a
commit 2be68dea28
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-2.6.22.nix
View File

@ -16,6 +16,10 @@
, # Your own kernel configuration file, if you don't want to use the , # Your own kernel configuration file, if you don't want to use the
# default. # default.
kernelConfig ? null kernelConfig ? null
, # A list of additional statements to be appended to the
# configuration file.
extraConfig ? []
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -38,7 +42,11 @@ stdenv.mkDerivation {
}; };
patches = map (p: p.patch) kernelPatches; patches = map (p: p.patch) kernelPatches;
extraConfig = lib.concatStrings (map (p: "\n" + (if p ? extraConfig then p.extraConfig else "") + "\n") kernelPatches); extraConfig =
let addNewlines = map (s: "\n" + s + "\n");
configFromPatches =
map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
config = config =
if kernelConfig != null then kernelConfig else if kernelConfig != null then kernelConfig else