[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/52: gnu: elogind: Make #:configure-flags a G-exp.
From: |
guix-commits |
Subject: |
02/52: gnu: elogind: Make #:configure-flags a G-exp. |
Date: |
Mon, 20 Sep 2021 07:19:26 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit ea91371466c9e6a6b8f2facfa244afc0c3eac840
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 09:28:14 2021 +0200
gnu: elogind: Make #:configure-flags a G-exp.
* 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 1379a24..3d4bc63 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -26,6 +26,7 @@
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,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)
@@ -581,33 +583,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
- branch core-updates-frozen updated (4bacf9c -> aacaa22), guix-commits, 2021/09/20
- 02/52: gnu: elogind: Make #:configure-flags a G-exp.,
guix-commits <=
- 01/52: gnu: dbus-glib: Support cross-compilation., guix-commits, 2021/09/20
- 07/52: gnu: nspr: Don't retain references to native inputs., guix-commits, 2021/09/20
- 11/52: build-system/glib-or-gtk: Support cross-compilaton., guix-commits, 2021/09/20
- 23/52: gnu: heimdal: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., guix-commits, 2021/09/20
- 12/52: gnu: dbus-cairo: Add missing bash-minimal input., guix-commits, 2021/09/20
- 18/52: gnu: bdb: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions., guix-commits, 2021/09/20
- 13/52: gnu: polkit: Prevent cross-compilation build error., guix-commits, 2021/09/20
- 17/52: gnu: atk: Disable introspection when cross-compiling., guix-commits, 2021/09/20