From 9ac776ab221317fdac18cbcb14c61e46cd2fa1a2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 11 Aug 2012 21:07:37 -0400
Subject: [PATCH] linux/manual-config.nix: Set sourceRoot directly to the
 pre-unpacked source rather than using a symlink

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index aa00bd2786a5..78b468176f28 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -113,8 +113,7 @@ let self = stdenv.mkDerivation {
   };
 
   unpackPhase = ''
-    ln -sv ${self.source} src
-    export sourceRoot="$(pwd)/src"
+    export sourceRoot="${self.source}"
     mkdir build
     export buildRoot="$(pwd)/build"
     cd $sourceRoot
@@ -146,12 +145,9 @@ let self = stdenv.mkDerivation {
   '' + (if isModular then ''
     make modules_install $makeFlags "''${makeFlagsArray[@]}" \
       $installFlags "''${installFlagsArray[@]}"
-    rm -f $out/lib/modules/${modDirVersion}/{build,source}
-    cd ..
-    mv $sourceRoot $out/lib/modules/${modDirVersion}/source
+    rm -f $out/lib/modules/${modDirVersion}/build
+    cd $buildRoot/..
     mv $buildRoot $out/lib/modules/${modDirVersion}/build
-    unlink $out/lib/modules/${modDirVersion}/build/source
-    ln -sv ${self.source} $out/lib/modules/${modDirVersion}/build/source
   '' else optionalString installsFirmware ''
     make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
       $installFlags "''${installFlagsArray[@]}"