summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-09 17:55:45 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-09 18:48:52 +0200
commit9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7 (patch)
treebea8a8773ffdac1b82602034481476f99b0ca369 /pkgs/os-specific
parentd9a4706f73430169bf1d49ea76ea0c15a1bb909b (diff)
downloadnixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar.gz
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar.bz2
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar.lz
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar.xz
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.tar.zst
nixpkgs-9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7.zip
Kernel module aggregator: Use kmod instead of module-init-tools
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kmod/aggregator.nix (renamed from pkgs/os-specific/linux/module-init-tools/aggregator.nix)8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix
index cc4e6ab3552..161af38ff60 100644
--- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix
+++ b/pkgs/os-specific/linux/kmod/aggregator.nix
@@ -1,4 +1,4 @@
-{stdenv, module_init_tools, modules, buildEnv}:
+{ stdenv, kmod, modules, buildEnv }:
 
 buildEnv {
   name = "kernel-modules";
@@ -8,20 +8,20 @@ buildEnv {
   postBuild =
     ''
       source ${stdenv}/setup
-    
+
       kernelVersion=$(cd $out/lib/modules && ls -d *)
       if test "$(echo $kernelVersion | wc -w)" != 1; then
          echo "inconsistent kernel versions: $kernelVersion"
          exit 1
       fi
-    
+
       echo "kernel version is $kernelVersion"
 
       # Regenerate the depmod map files.  Be sure to pass an explicit
       # kernel version number, otherwise depmod will use `uname -r'.
       if test -w $out/lib/modules/$kernelVersion; then
           rm -f $out/lib/modules/$kernelVersion/modules.*
-          MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
+          ${kmod}/sbin/depmod -b $out -a $kernelVersion
       fi
     '';
 }