From 4e9b120ad2c2a5c4e65df65dcf8a8de7051550d1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 17 Jan 2009 13:40:12 +0000
Subject: [PATCH] small fixes to build custom kernel

svn path=/nixpkgs/trunk/; revision=13795
---
 pkgs/os-specific/linux/kernel/generic.nix | 4 ++++
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 11bac64ced7..4db485c2c47 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -34,6 +34,8 @@
 , # A list of additional statements to be appended to the
   # configuration file.
   extraConfig ? []
+
+, preConfigure ? ""
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -55,6 +57,8 @@ stdenv.mkDerivation {
   
   builder = ./builder.sh;
 
+  inherit preConfigure;
+
   inherit src config;
   
   patches = map (p: p.patch) kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a320aac3ed..0db0171a001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6445,7 +6445,7 @@ let
   kernelPackages = kernelPackages_2_6_25;
 
   customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools lib;
+    inherit fetchurl stdenv perl mktemp module_init_tools;
   });
 
   libselinux = import ../os-specific/linux/libselinux {