From 275671165211595855226ec99170ee923366047a Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Sun, 16 Oct 2016 20:29:18 +0200
Subject: [PATCH] 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
---
 .../tools/networking/network-manager/PppdPath.patch | 13 +++++++++++++
 pkgs/tools/networking/network-manager/default.nix   |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/tools/networking/network-manager/PppdPath.patch

diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch
new file mode 100644
index 00000000000..98c1308e4db
--- /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 608b9ea17fe..d96bc08495f 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 ];