From e32787dc9470eabaf2f5fe8f4572402cf3aadd21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Feb 2008 23:13:18 +0000
Subject: [PATCH] * Fix AEFS on x86_64.

svn path=/nixpkgs/trunk/; revision=10561
---
 pkgs/os-specific/linux/aufs/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index c053a807307..2ce510a5b9b 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -9,12 +9,15 @@ stdenv.mkDerivation {
   };
 
   buildPhase = ''
-    mkdir kernelsrc
-    tar xvf ${kernel.src} -C kernelsrc
-  
+
     kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    substituteInPlace fs/aufs/Makefile --replace srctree srctree2
-    make KDIR=${kernel}/lib/modules/$kernelVersion/build srctree2=$(pwd)/kernelsrc/* -f local.mk
+    kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
+    tar xvfj ${kernel.src}
+    kernelSource=$(echo $(pwd)/linux-*)
+    cp -prd $kernelBuild/* $kernelSource
+  
+    substituteInPlace fs/aufs/Makefile
+    make KDIR=$kernelSource -f local.mk
   '';
 
   installPhase = ''