From: Jelle Licht <jlicht@fsfe.org>
To: 36542@debbugs.gnu.org
Subject: [bug#36542] [PATCH 5/6] gnu: network-manager-openvpn: Patch hardcoded paths.
Date: Sun, 7 Jul 2019 21:28:47 +0200 [thread overview]
Message-ID: <20190707192848.10049-5-jlicht@fsfe.org> (raw)
In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org>
* gnu/packages/gnome.scm (network-manager-openvpn)[arguments]: Add custom
'patch-path' phase to replace references to openvpn and modprobe.
[inputs]: Add kmod.
---
gnu/packages/gnome.scm | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index df273d4dad..b68aed804f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -37,6 +37,7 @@
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5448,12 +5449,31 @@ services.")
"0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")))
+ `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'patch-path
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let* ((ovpn (string-append (assoc-ref inputs "openvpn")
+ "/sbin/openvpn"))
+ (modprobe (string-append (assoc-ref inputs "kmod")
+ "/bin/modprobe"))
+ (pretty-ovpn (string-append "\"" ovpn "\"")))
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("\"/usr/local/sbin/openvpn\"") pretty-ovpn)
+ (("\"/usr/sbin/openvpn\"") pretty-ovpn)
+ (("\"/sbin/openvpn\"") pretty-ovpn)
+ (("/sbin/modprobe") modprobe)))
+ '("src/nm-openvpn-service.c" "properties/nm-openvpn-editor.c")))
+ #t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(inputs
`(("gtk+" ,gtk+)
+ ("kmod" ,kmod)
("openvpn" ,openvpn)
("network-manager" ,network-manager)
("network-manager-applet" ,network-manager-applet) ;for libnma
--
2.22.0
next prev parent reply other threads:[~2019-07-07 19:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 19:27 [bug#36542] [PATCH 0/6] Fix network-manager vpn plugins Jelle Licht
2019-07-07 19:28 ` [bug#36542] [PATCH 1/6] gnu: network-manager: Fix plugin loading problem Jelle Licht
2019-07-07 19:28 ` [bug#36542] [PATCH 2/6] services: network-manager: Properly load vpn plugins Jelle Licht
2019-07-07 19:28 ` [bug#36542] [PATCH 3/6] services: network-manager: Clear default OpenVPN user Jelle Licht
2019-07-07 19:28 ` [bug#36542] [PATCH 4/6] gnu: network-manager-openvpn: Pass '--localstatedir=/var' Jelle Licht
2019-07-07 19:28 ` Jelle Licht [this message]
2019-07-07 19:28 ` [bug#36542] [PATCH 6/6] gnu: Add network-manager-vpnc Jelle Licht
2019-07-13 9:54 ` [bug#36542] [PATCH 1/6] gnu: network-manager: Fix plugin loading problem Ludovic Courtès
2019-07-17 9:30 ` bug#36542: " Jelle Licht
2019-07-07 21:35 ` [bug#36542] [PATCH 0/6] Fix network-manager vpn plugins Pierre Langlois
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190707192848.10049-5-jlicht@fsfe.org \
--to=jlicht@fsfe.org \
--cc=36542@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).