* Dietlibc: symlink to the asm directory from kernel-headers, because

some programs (such as module-init-tools) need it.
* Remove module-init-tools-static, it now builds out of the box with
  dietlibc.

svn path=/nixpkgs/trunk/; revision=6938

pkgs/os-specific/linux/dietlibc/builder.sh

@@ -19,6 +19,11 @@ postInstall() {
     # Remove <dlfcn.h>, it makes some packages think we can load
     # dynamic libraries.
     rm $out/include/dlfcn.h
+
+    # Dietlibc has a asm include directory, whose presence makes the
+    # asm directory of kernel-headers unreachable.  So make symlinks
+    # from the dietlibc asm to the kernel-headers asm.
+    ln -s $kernelHeaders/include/asm/* $out/include/asm/ || true
 }
 
 genericBuild

pkgs/os-specific/linux/dietlibc/default.nix

@@ -9,7 +9,9 @@ stdenv.mkDerivation {
     md5 = "2465d652fff6f1fad3da3b98e60e83c9";
   };
   builder = ./builder.sh;
+  
   inherit glibc;
+  kernelHeaders = glibc.kernelHeaders;
 
   patches = [
 

pkgs/os-specific/linux/module-init-tools-static/builder.sh

@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-export LDFLAGS=-static
-
-genericBuild

pkgs/os-specific/linux/module-init-tools-static/default.nix

@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "module-init-tools-3.2.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/module-init-tools-3.2.2.tar.bz2;
-    md5 = "a1ad0a09d3231673f70d631f3f5040e9";
-  };
-  patches = [./module-init-tools-static.patch];
-}
-
-

pkgs/os-specific/linux/module-init-tools-static/module-init-tools-static.patch

@@ -1,12 +0,0 @@
-diff -ruN module-init-tools-3.2.2/configure module-init-tools-3.2.2.new/configure
---- module-init-tools-3.2.2/configure	2005-12-07 05:43:46.000000000 +0100
-+++ module-init-tools-3.2.2.new/configure	2005-12-24 00:37:44.000000000 +0100
-@@ -1741,7 +1741,7 @@
- #define CONFIG_USE_ZLIB 1
- _ACEOF
- 
--  zlib_flags="-Wl,-Bstatic -lz -Wl,-Bdynamic"
-+  zlib_flags="-Wl,-Bstatic -lz"
- fi
- fi;
- 

pkgs/os-specific/linux/module-init-tools/default.nix

@@ -7,6 +7,5 @@ stdenv.mkDerivation {
     md5 = "a1ad0a09d3231673f70d631f3f5040e9";
   };
   patches = [./module-dir.patch];
+  postInstall = "rm $out/sbin/insmod.static"; # don't need it
 }
-
-

pkgs/top-level/all-packages.nix

@@ -2143,10 +2143,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  module_init_toolsStatic = import ../os-specific/linux/module-init-tools-static {
-    inherit fetchurl stdenv;
-  };
-
   modutils = import ../os-specific/linux/modutils {
     inherit fetchurl bison flex;
     stdenv = overrideGCC stdenv gcc34;