diff options
| author | Kai Harries <kai.harries@gmail.com> | 2016-10-16 20:29:18 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-23 20:41:58 +0200 |
| commit | 275671165211595855226ec99170ee923366047a (patch) | |
| tree | db73a4bfaad48ea64e365bf031889ba0cf583e66 /pkgs/tools/networking/network-manager | |
| parent | bdc4397303fcd6312cdb321d0870099b88b0625b (diff) | |
| download | nixlib-275671165211595855226ec99170ee923366047a.tar nixlib-275671165211595855226ec99170ee923366047a.tar.gz nixlib-275671165211595855226ec99170ee923366047a.tar.bz2 nixlib-275671165211595855226ec99170ee923366047a.tar.lz nixlib-275671165211595855226ec99170ee923366047a.tar.xz nixlib-275671165211595855226ec99170ee923366047a.tar.zst nixlib-275671165211595855226ec99170ee923366047a.zip | |
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
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 ]; |