* Get User Mode Linux to compile again:

- Hack to make it work with the latest host kernel headers
    (2.6.18.1).
  - Don't call depmod impurily, rather use oldskool modutils.
  - modutils: use the final version, and use GCC 3.4 to compile it
    (4.1 doesn't work).

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

pkgs/misc/uml/builder.sh

@@ -31,7 +31,7 @@ installPhase() {
     mkdir $out
     mkdir $out/bin
     cp -p linux $out/bin
-    make modules_install INSTALL_MOD_PATH=$out ARCH=um
+    make modules_install INSTALL_MOD_PATH=$out ARCH=um DEPMOD=$modutils/sbin/depmod
 }
 installPhase=installPhase
 

pkgs/misc/uml/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, m4, gcc}:
+{stdenv, fetchurl, perl, m4, gcc, modutils}:
 
 assert perl != null && m4 != null;
 
@@ -19,4 +19,11 @@ stdenv.mkDerivation {
   config = ./config;
   buildInputs = [perl m4];
   NIX_GCC = gcc;
+
+  # Quick hack to get UML to build with the latest kernel headers,
+  # which don't export the macro `offsetof' anymore unless __KERNEL__
+  # is set.
+  NIX_CFLAGS_COMPILE = "-Doffsetof(TYPE,MEMBER)=((size_t)&((TYPE*)0)->MEMBER)";
+
+  inherit modutils;
 }