fixes

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

2 files changed, 7 insertions, 7 deletions

diff --git a/pkgs/os-specific/linux/kernelscripts/builder.sh b/pkgs/os-specific/linux/kernelscripts/builder.sh
index 81b10a2fd4f75..56097f446ff59 100755
--- a/pkgs/os-specific/linux/kernelscripts/builder.sh
+++ b/pkgs/os-specific/linux/kernelscripts/builder.sh
@@ -1,6 +1,6 @@
-#! /bin/sh -e
+source $stdenv/setup
 
-export MODULE_DIR=$out/lib/modules
+export MODULE_DIR=$out/lib/modules/
 
 kernelVersion=$(cd $kernel/lib/modules/; ls -d *)
 
@@ -16,16 +16,16 @@ find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i%
 
 find . -not -path "./lib/modules/$kernelVersion/build*" -a -not -path \
   "./System*" -a -not -path "./vmlinuz*" -type f | xargs -n 1 -i% \
-  ln -s $kernel/% $archivesDir/%
+  ln -s $kernel/% $out/%
 
 # echo making ov511 directories
 
 # cd $ov511
-# @findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
+# @findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $out/%
 # 
 # echo symlinking ov511 modules
 # 
-# @findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%
+# @findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $out/%
 
 # running depmod
-$module_init_tools/sbin/depmod -ae
+$module_init_tools/sbin/depmod -ae $kernelVersion
diff --git a/pkgs/os-specific/linux/kernelscripts/default.nix b/pkgs/os-specific/linux/kernelscripts/default.nix
index dc2025de42c3c..55d91e27d136e 100644
--- a/pkgs/os-specific/linux/kernelscripts/default.nix
+++ b/pkgs/os-specific/linux/kernelscripts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
-  name = "module-init-tools-script-0.0.1";
+  name = "kernelscripts-0.0.1";
 
   inherit module_init_tools kernel modules;
 }