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/tools/networking | |
| 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/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/openvpn.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/vpnc.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 0009aaf6b44..6a93100fa10 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = '' diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index be026457195..4b98600611e 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openvpn-service.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" substituteInPlace "properties/auth-helpers.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 5f3ab00ebc4..64de5408c7e 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-vpnc-service.c" \ --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = '' |