jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

networkmanager: sed from gnused, not coreutils! fix bad path

Browse Source
This commit is contained in:
Will Dietz 2019-05-03 19:19:49 -05:00
parent 3b481dfdf9
commit 5ce6bfea53
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/networking/network-manager/default.nix
View File

@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool coreutils dbus; inherit iputils kmod openconnect ethtool gnused dbus;
inherit (stdenv) shell; inherit (stdenv) shell;
}) })

2
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@ -19,7 +19,7 @@
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", 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="/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" LABEL="nm_drivers_end"
--- a/data/NetworkManager.service.in --- a/data/NetworkManager.service.in