guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 21467e43f1653ef28f692db83e1f27f3efe4ed18
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Sep 30 21:05:08 2025 +0300
gnu: libinput-minimal: Fix build on 32-bit systems.
* gnu/packages/freedesktop.scm (libinput)[arguments]: When building for
a 32-bit system add a phase to fix the test suite.
Change-Id: I9bb40e17cd83e61ff6a4cb7adf6b9a4685bd9246
---
gnu/packages/freedesktop.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d5589fba19..b6083dadea 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2015-2017, 2019, 2021-2022, 2025 Ludovic Courtès <[email protected]>
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus
<[email protected]>
;;; Copyright © 2015 David Hashe <[email protected]>
-;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner
<[email protected]>
+;;; Copyright © 2016, 2017, 2019, 2021-2025 Efraim Flashner
<[email protected]>
;;; Copyright © 2016 Kei Kebreau <[email protected]>
;;; Copyright © 2017 Nikita <[email protected]>
;;; Copyright © 2017, 2018 Mark H Weaver <[email protected]>
@@ -603,7 +603,16 @@ freedesktop.org project.")
;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test
that
;; hangs, and the comments around it suggests that we should be using
this
;; Meson target anyway.
- #:build-type "release"))
+ #:build-type "release"
+ #:phases
+ ,@(if (target-64bit?)
+ `(%standard-phases)
+ `((modify-phases %standard-phases
+ ;; Backported from a commit after the 1.29.0 release.
+ (add-after 'unpack 'correct-value-type-in-atou64_test
+ (lambda _
+ (substitute* "test/test-utils.c"
+ (("unsigned long val") "uint64_t val")))))))))
(native-inputs
(append (list check pkg-config python-minimal-wrapper python-pytest)
(if (%current-target-system)
