[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp.
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp. |
Date: |
Wed, 25 Aug 2021 20:02:42 +0200 |
* gnu/packages/freedesktop.scm
(elogind)[arguments]{configure-flags}: Let this be a G-exp.
---
gnu/packages/freedesktop.scm | 56 +++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7766edf04..e0f5623805 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,6 +46,7 @@
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -578,33 +580,33 @@ the freedesktop.org XDG Base Directory specification.")
(build-system meson-build-system)
(arguments
`(#:configure-flags
- (let* ((out (assoc-ref %outputs "out"))
- (sysconf (string-append out "/etc"))
- (libexec (string-append out "/libexec/elogind"))
- (dbuspolicy (string-append out "/etc/dbus-1/system.d"))
- (shadow (assoc-ref %build-inputs "shadow"))
- (shepherd (assoc-ref %build-inputs "shepherd"))
- (halt-path (string-append shepherd "/sbin/halt"))
- (kexec-path "") ;not available in Guix yet
- (nologin-path (string-append shadow "/sbin/nologin"))
- (poweroff-path (string-append shepherd "/sbin/shutdown"))
- (reboot-path (string-append shepherd "/sbin/reboot")))
- (list
- (string-append "-Drootprefix=" out)
- (string-append "-Dsysconfdir=" sysconf)
- (string-append "-Drootlibexecdir=" libexec)
- (string-append "-Ddbuspolicydir=" dbuspolicy)
- (string-append "-Dc_link_args=-Wl,-rpath=" libexec)
- (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
- (string-append "-Dhalt-path=" halt-path)
- (string-append "-Dkexec-path=" kexec-path)
- (string-append "-Dpoweroff-path=" poweroff-path)
- (string-append "-Dreboot-path=" reboot-path)
- (string-append "-Dnologin-path=" nologin-path)
- "-Dcgroup-controller=elogind"
- "-Dman=true"
- ;; Disable some tests.
- "-Dslow-tests=false"))
+ ,#~(let* ((out (assoc-ref %outputs "out"))
+ (sysconf (string-append out "/etc"))
+ (libexec (string-append out "/libexec/elogind"))
+ (dbuspolicy (string-append out "/etc/dbus-1/system.d"))
+ (shadow (assoc-ref %build-inputs "shadow"))
+ (shepherd (assoc-ref %build-inputs "shepherd"))
+ (halt-path (string-append shepherd "/sbin/halt"))
+ (kexec-path "") ;not available in Guix yet
+ (nologin-path (string-append shadow "/sbin/nologin"))
+ (poweroff-path (string-append shepherd "/sbin/shutdown"))
+ (reboot-path (string-append shepherd "/sbin/reboot")))
+ (list
+ (string-append "-Drootprefix=" out)
+ (string-append "-Dsysconfdir=" sysconf)
+ (string-append "-Drootlibexecdir=" libexec)
+ (string-append "-Ddbuspolicydir=" dbuspolicy)
+ (string-append "-Dc_link_args=-Wl,-rpath=" libexec)
+ (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
+ (string-append "-Dhalt-path=" halt-path)
+ (string-append "-Dkexec-path=" kexec-path)
+ (string-append "-Dpoweroff-path=" poweroff-path)
+ (string-append "-Dreboot-path=" reboot-path)
+ (string-append "-Dnologin-path=" nologin-path)
+ "-Dcgroup-controller=elogind"
+ "-Dman=true"
+ ;; Disable some tests.
+ "-Dslow-tests=false"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-pkttyagent-path
--
2.33.0
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 01/52] gnu: dbus-glib: Support cross-compilation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp.,
Maxime Devos <=
- [bug#50201] [PATCH 04/52] gnu: libcap: Fix cross-compilation build failures., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 06/52] gnu: nspr: Adjust to Mozilla cross-compilation conventions., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 07/52] gnu: nspr: Don't retain references to native inputs., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 09/52] gnu: poppler: Find pkg-config when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 08/52] gnu: mozjs-60: Fix cross-compilation build errors., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 10/52] build-system/meson: Allow 'configure-flags' to be a G-exp., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 12/52] gnu: dbus-cairo: Add missing bash-minimal input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 20/52] gnu: gamin: Recognise aarch64 as architecture when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 22/52] gnu: iso-codes: Move inputs to native-inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 17/52] gnu: atk: Disable introspection when cross-compiling., Maxime Devos, 2021/08/25