diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-22 10:40:57 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-22 10:40:57 +0300 |
| commit | 01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8 (patch) | |
| tree | 50d9531f27e58ce9dcbea28b5b42a375beeeda73 /pkgs/os-specific/linux | |
| parent | d99eaf005c1f21fb190fb2aa3f8b2f63218829d8 (diff) | |
| download | nixpkgs-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/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/pcmciautils/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pm-utils/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index ce5814965ef..3e41df9465f 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , yacc, flex -, sysfsutils, module_init_tools, udev +, sysfsutils, kmod, udev , firmware # Special pcmcia cards. , config # Special hardware (map memory & port & irq) , lib # used to generate postInstall script. @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3"; }; - buildInputs = [udev yacc sysfsutils module_init_tools flex]; + buildInputs = [udev yacc sysfsutils kmod flex]; patchPhase = '' sed -i " - s,/sbin/modprobe,${module_init_tools}&,; + s,/sbin/modprobe,${kmod}&,; s,/lib/udev/,$out/sbin/,; " udev/* # fix-color */ sed -i " diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 19315ec2d0b..cb74dc204a3 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools +{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod , procps, kbd, dbus_tools }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; + [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] [ procps ]; |