diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-23 14:29:41 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-23 14:29:41 +0300 |
| commit | bd18cc3cdcd93687875fd048c87797b47940c919 (patch) | |
| tree | 1540e0a1bd9a742ddb46fc2b25cb88cc4e8e630a /pkgs/tools/networking | |
| parent | d687cd5e867b518087077e16aa581e7e832d55d3 (diff) | |
| parent | 0f8a49bb4511b29985d426d3e1b0e83c9d3eb763 (diff) | |
| download | nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar.gz nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar.bz2 nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar.lz nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar.xz nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.tar.zst nixlib-bd18cc3cdcd93687875fd048c87797b47940c919.zip | |
Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
Delete all usages of module_init_tools and remove the package
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 0009aaf6b440..6a93100fa105 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 be0264571953..4b98600611e4 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 5f3ab00ebc43..64de5408c7e0 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 = '' |