nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: network-manager-openvpn: Patch hardcoded paths. 

* gnu/packages/gnome.scm (network-manager-openvpn)[arguments]: Add custom
'patch-path' phase to replace references to openvpn and modprobe.
[inputs]: Add kmod.
This commit is contained in:
Jelle Licht 2019-07-07 21:01:05 +02:00
parent d9af93c4ea
commit 633422b0e6
No known key found for this signature in database
GPG Key ID: DA4597F947B41025
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/gnome.scm
View File

@ -37,6 +37,7 @@
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -5447,12 +5448,31 @@ services.")
"0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr")))) "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (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 (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool))) ("intltool" ,intltool)))
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("kmod" ,kmod)
("openvpn" ,openvpn) ("openvpn" ,openvpn)
("network-manager" ,network-manager) ("network-manager" ,network-manager)
("network-manager-applet" ,network-manager-applet) ;for libnma ("network-manager-applet" ,network-manager-applet) ;for libnma