diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-29 08:38:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 08:38:21 +0000 |
| commit | 97aba37876c4513102b0acef05f3438c0b896840 (patch) | |
| tree | a5588fe46f892687b80e2c782ba9cb3834f7f50f /pkgs/tools/networking | |
| parent | 3dbb0207738e9102dacfb1bc60d455ef204759be (diff) | |
| parent | 36a6746f2178141465761ce36de888389bc2968a (diff) | |
Merge pull request #61657 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/jnettop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/fix-paths.patch | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 19626174ba4c6..47aeb8574b68c 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf libpcap ncurses glib ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ libpcap ncurses glib ]; patches = [ ./no-dns-resolution.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f6077b8c2f830..c60a409fba5cd 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool coreutils dbus; + inherit iputils kmod openconnect ethtool gnused dbus; inherit (stdenv) shell; }) diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index 58e3fc6dc5dd4..938fcbdc7719c 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -19,7 +19,7 @@ ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" DRIVERS=="?*", GOTO="nm_drivers_end" -PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" -+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" LABEL="nm_drivers_end" --- a/data/NetworkManager.service.in |