diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-26 18:42:46 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 18:17:37 -0500 |
| commit | ef428ab202322b93930c3db0d66573c16f692c5f (patch) | |
| tree | c340599d258ab4a0054556f473413681bbca9691 /pkgs/tools/networking | |
| parent | ce8ce600ae41d3899e4a556fa9ff8a1a34374063 (diff) | |
| download | nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.gz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.bz2 nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.lz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.xz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.zst nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.zip | |
treewide: cleanup procps uses
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/strongswan.nix | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index efaa146c72f3..27fd4c4adc30 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, kmod }: +, withGnome ? true, gnome3, sysctl, kmod }: let pname = "NetworkManager-openconnect"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ --replace "/sbin/modprobe" "${kmod}/bin/modprobe" @@ -42,4 +42,3 @@ in stdenv.mkDerivation rec { inherit (networkmanager.meta) maintainers platforms; }; } - diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index cfa304901b48..fb3ba2bbdf5a 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl , gnome3, libgnome-keyring, libsecret }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" ''; configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; |