diff options
| author | Will Dietz <w@wdtz.org> | 2019-05-03 19:19:49 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-05-03 19:58:00 -0500 |
| commit | 5ce6bfea5340a7564c61eb1e108985bc352c6c2b (patch) | |
| tree | cd653e9adafcbb0bc47942141dc96a609a6fea90 /pkgs/tools/networking/network-manager | |
| parent | 3b481dfdf9e258b0354885c971a7d2edffd39292 (diff) | |
| download | nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar.gz nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar.bz2 nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar.lz nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar.xz nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.tar.zst nixlib-5ce6bfea5340a7564c61eb1e108985bc352c6c2b.zip | |
networkmanager: sed from gnused, not coreutils! fix bad path
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/fix-paths.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 79913d439687..b6073494a222 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 58e3fc6dc5dd..938fcbdc7719 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 |