aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Pierre De Jesus DIAZ <me@jeandudey.tech>2022-07-05 12:33:16 +0200
committerEfraim Flashner <efraim@flashner.co.il>2022-07-06 12:44:13 +0300
commit8760decca72c2b720734b04517b8d3daef3b484d (patch)
tree71c9156bc86551e5de4251ea1c20318998873db6
parent932bf7b293f8c9ee59579d1cc05c36578946818e (diff)
downloadguix-8760decca72c2b720734b04517b8d3daef3b484d.tar.gz
guix-8760decca72c2b720734b04517b8d3daef3b484d.zip
gnu: connman: Fix cross-compilation.
* gnu/packages/connman.scm (connman): Fix cross-compilation. [arguments]: Use G-Expressions. Set path to binaries at `#:configure-flags'. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--gnu/packages/connman.scm38
1 files changed, 25 insertions, 13 deletions
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 6221b56d77..71dff3588f 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -24,6 +24,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -55,19 +56,30 @@
(base32 "12g5ilcnymx6i45z3359yds3cgd2dfqjyncfm92hqlymzps41yvr"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list "--enable-nmcompat"
- "--enable-polkit" ; Polkit doesn't need to be present at build time.
- "--enable-iwd"
- "--enable-openconnect"
- "--enable-openvpn"
- "--enable-vpnc"
- "--enable-l2tp"
- "--localstatedir=/var"
- (string-append
- "--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
- (string-append
- "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share"))))
+ (list #:configure-flags
+ #~(list "--enable-nmcompat"
+ ;; PolKit doesn't need to be present at build time.
+ "--enable-polkit"
+ "--enable-iwd"
+ "--enable-l2tp"
+ "--enable-openconnect"
+ "--enable-openvpn"
+ "--enable-vpnc"
+ "--localstatedir=/var"
+ (string-append "--with-l2tp="
+ #$(this-package-input "xl2tpd")
+ "/sbin/xl2tpd")
+ (string-append "--with-openconnect="
+ #$(this-package-input "openconnect")
+ "/sbin/openconnect")
+ (string-append "--with-openvpn="
+ #$(this-package-input "openvpn")
+ "/sbin/openvpn")
+ (string-append "--with-vpnc="
+ #$(this-package-input "vpnc")
+ "/sbin/vpnc")
+ (string-append "--with-dbusconfdir=" #$output "/etc")
+ (string-append "--with-dbusdatadir=" #$output "/share"))))
(native-inputs
(list pkg-config
python-wrapper))