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

network-manager: give path to pppd executable 

This fixes an issue I have faced when trying to connect to the internet
via wwan gsm modem.

(cherry picked from commit 0775adc599f4706e3ff020e700b5f8f69578b6b1)

Closes https://github.com/NixOS/nixpkgs/pull/19812
This commit is contained in:
Kai Harries 2016-10-16 20:29:18 +02:00 committed by Joachim Fasting
parent bdc4397303
commit 2756711652
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/networking/network-manager/PppdPath.patch Normal file
View File

@ -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;

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

@ -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 ];