On Thu, Jul 04, 2019 at 04:46:32PM +0200, pelzflorian (Florian Pelz) wrote:
> I suppose the attached patch could help. It builds, but I could not
> test.
>
> Adam, could you try it? Just follow the Guix manual’s instructions on
> Contributing and `git am the-attached-patch`.
>
Only if ./pre-inst-env guix system reconfigure with the patch before
is not sufficient, could you try the one attached here instead? (git
reset --hard master, then git am this-new-patch and reconfigure.)
Regards,
Florian
>From 6eea4f17af471a85dd89adce3acb895fc0fd341f Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflor...@pelzflorian.de>
Date: Thu, 4 Jul 2019 17:56:34 +0200
Subject: [PATCH] gnu: network-manager: Add ppp input, configure flag and
substitute to use it.
* gnu/packages/gnome.scm (network-manager): Add them.
---
gnu/packages/gnome.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2820be0022..9ab0d15df6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5313,6 +5313,9 @@ users.")
(("systemd") "elogind"))
(substitute* "./src/nm-logging.c"
(("systemd") "elogind"))
+ (substitute* "src/ppp/nm-ppp-manager.c"
+ (("nm_utils_find_helper \\(\"pppd\".*")
+ "PPPD_PATH;"))
#t))))
(build-system gnu-build-system)
(outputs '("out"
@@ -5322,7 +5325,9 @@ users.")
(let ((out (assoc-ref %outputs "out"))
(doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
- "/sbin/dhclient")))
+ "/sbin/dhclient"))
+ (pppd (string-append (assoc-ref %build-inputs "ppp")
+ "/sbin/pppd")))
(list "--with-systemd-logind=yes" ;In Guix System, this is provided
by elogind.
"--with-consolekit=no"
"--with-crypto=gnutls"
@@ -5335,7 +5340,8 @@ users.")
out "/etc/dbus-1/system.d")
(string-append "--with-html-dir="
doc "/share/gtk-doc/html")
- (string-append "--with-dhclient=" dhclient)))
+ (string-append "--with-dhclient=" dhclient)
+ (string-append "--with-pppd=" pppd)))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
@@ -5395,6 +5401,7 @@ users.")
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
+ ("ppp" ,ppp)
;; For testing.
("python" ,python-wrapper)
("python-dbus" ,python-dbus)
--
2.22.0
