diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
| commit | 7077a270bf625b320ab61e3951aa19c9d514b5dc (patch) | |
| tree | 42660271ea34c60368a6e3393ac5eedb65fe4a78 /pkgs/tools/networking/network-manager | |
| parent | fea23020fef87f20fe81477d33eb9b8ca72e7f2e (diff) | |
| parent | 2273849a85e49d3a1fe55d11110cebb3377dddf6 (diff) | |
| download | nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.gz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.bz2 nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.lz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.xz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.zst nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/PppdPath.patch | 13 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch new file mode 100644 index 000000000000..98c1308e4dbf --- /dev/null +++ b/pkgs/tools/networking/network-manager/PppdPath.patch @@ -0,0 +1,13 @@ +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c +index 89a7add..ae99eb4 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self, + + g_return_val_if_fail (setting != NULL, NULL); + +- pppd_binary = nm_utils_find_helper ("pppd", NULL, err); ++ pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err); + if (!pppd_binary) + return NULL; + diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 608b9ea17fe1..d96bc08495f0 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; + patches = [ ./PppdPath.patch ]; + buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; |