diff options
| author | Will Dietz <w@wdtz.org> | 2019-05-07 22:50:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 22:50:58 -0500 |
| commit | 666bcbeb5aa41d6b6f538901dca6f45a7d471e3d (patch) | |
| tree | 4a4cec872e2d000f89f05d94ed7b434477fce361 /pkgs | |
| parent | 163bc2c5983f630c65ca5da9d0a637a2598856ea (diff) | |
| parent | 5ce6bfea5340a7564c61eb1e108985bc352c6c2b (diff) | |
| download | nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar.gz nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar.bz2 nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar.lz nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar.xz nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.tar.zst nixlib-666bcbeb5aa41d6b6f538901dca6f45a7d471e3d.zip | |
Merge pull request #60903 from dtzWill/fix/networkmanager-sed-path
networkmanager: sed from gnused, not coreutils! fix bad path
Diffstat (limited to 'pkgs')
| -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 f6077b8c2f83..c60a409fba5c 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 |