From 6225e46bafe14661973ce541344ad3f3af39149b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Oct 2006 16:03:19 +0000
Subject: [PATCH] * Use a pure depmod.

svn path=/nixpkgs/trunk/; revision=6916
---
 pkgs/os-specific/linux/kernel/builder.sh       | 2 +-
 pkgs/os-specific/linux/kernel/linux-2.6.18.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index a897fd991a7..b612371f715 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -33,7 +33,7 @@ installPhase() {
         
 	make install
 
-	make modules_install
+	make modules_install DEPMOD=$module_init_tools/sbin/depmod
 
         # Strip the kernel modules.
         echo "Stripping kernel modules..."
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.18.nix b/pkgs/os-specific/linux/kernel/linux-2.6.18.nix
index 948dfd008a7..f3233eada50 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.18.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, mktemp
+{ stdenv, fetchurl, perl, mktemp, module_init_tools
 
   # A list of patches to apply to the kernel.  Each element of this list
   # should be an attribute set {name, patch} where `name' is a
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
   buildInputs = [perl mktemp];
   arch="i386";
 
+  inherit module_init_tools;
+
   meta = {
     description =
       "The Linux kernel" +
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bca8e6d9e8e..ff38a2e92f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2089,7 +2089,7 @@ rec {
   kernel = kernel_2_6_18;
 
   kernel_2_6_18 = import ../os-specific/linux/kernel/linux-2.6.18.nix {
-    inherit fetchurl perl mktemp;
+    inherit fetchurl perl mktemp module_init_tools;
     stdenv = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
     kernelPatches = [
       { name = "skas-2.6.18-v9-pre9";