summary refs log tree commit diff
path: root/pkgs/build-support/vm/default.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-04-22 10:40:57 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-04-22 10:40:57 +0300
commit01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8 (patch)
tree50d9531f27e58ce9dcbea28b5b42a375beeeda73 /pkgs/build-support/vm/default.nix
parentd99eaf005c1f21fb190fb2aa3f8b2f63218829d8 (diff)
downloadnixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar.gz
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar.bz2
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar.lz
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar.xz
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.tar.zst
nixpkgs-01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8.zip
treewide: Replace module_init_tools -> kmod
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
Diffstat (limited to 'pkgs/build-support/vm/default.nix')
-rw-r--r--pkgs/build-support/vm/default.nix28
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index e670e1ef225..2d33a197346 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -329,14 +329,14 @@ rec {
       buildInputs = [ utillinux ];
       buildCommand = ''
         ln -s ${linux}/lib /lib
-        ${module_init_tools}/bin/modprobe loop
-        ${module_init_tools}/bin/modprobe ext4
-        ${module_init_tools}/bin/modprobe hfs
-        ${module_init_tools}/bin/modprobe hfsplus
-        ${module_init_tools}/bin/modprobe squashfs
-        ${module_init_tools}/bin/modprobe iso9660
-        ${module_init_tools}/bin/modprobe ufs
-        ${module_init_tools}/bin/modprobe cramfs
+        ${kmod}/bin/modprobe loop
+        ${kmod}/bin/modprobe ext4
+        ${kmod}/bin/modprobe hfs
+        ${kmod}/bin/modprobe hfsplus
+        ${kmod}/bin/modprobe squashfs
+        ${kmod}/bin/modprobe iso9660
+        ${kmod}/bin/modprobe ufs
+        ${kmod}/bin/modprobe cramfs
         mknod /dev/loop0 b 7 0
 
         mkdir -p $out
@@ -355,12 +355,12 @@ rec {
       buildInputs = [ utillinux mtdutils ];
       buildCommand = ''
         ln -s ${linux}/lib /lib
-        ${module_init_tools}/bin/modprobe mtd
-        ${module_init_tools}/bin/modprobe mtdram total_size=131072
-        ${module_init_tools}/bin/modprobe mtdchar
-        ${module_init_tools}/bin/modprobe mtdblock
-        ${module_init_tools}/bin/modprobe jffs2
-        ${module_init_tools}/bin/modprobe zlib
+        ${kmod}/bin/modprobe mtd
+        ${kmod}/bin/modprobe mtdram total_size=131072
+        ${kmod}/bin/modprobe mtdchar
+        ${kmod}/bin/modprobe mtdblock
+        ${kmod}/bin/modprobe jffs2
+        ${kmod}/bin/modprobe zlib
         mknod /dev/mtd0 c 90 0
         mknod /dev/mtdblock0 b 31 0