[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation.
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation. |
Date: |
Wed, 25 Aug 2021 20:02:43 +0200 |
%build-inputs and friends don't exist when cross-compiling,
so use some G-expology instead.
* gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>:
Don't use '%outputs' or '%build-inputs' when cross-compiling.
---
gnu/packages/freedesktop.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index e0f5623805..0f6bb72a1f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -580,12 +580,20 @@ the freedesktop.org XDG Base Directory specification.")
(build-system meson-build-system)
(arguments
`(#:configure-flags
- ,#~(let* ((out (assoc-ref %outputs "out"))
+ ;; TODO(core-updates): Use #$output unconditionally.
+ ,#~(let* ((out #$(if (%current-target-system)
+ #~#$output
+ #~(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"))
+ ;; TODO(core-updates): use this-package-input unconditionally.
+ (shadow #$(if (%current-target-system)
+ (this-package-input "shadow")
+ #~(assoc-ref %build-inputs "shadow")))
+ (shepherd #$(if (%current-target-system)
+ (this-package-input "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"))
--
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 <=
- [bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp., Maxime Devos, 2021/08/25
- [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