From 21467e43f1653ef28f692db83e1f27f3efe4ed18 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Sep 2025 21:05:08 +0300 Subject: [PATCH] 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 d5589fba198..b6083dadea3 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 ;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2015 David Hashe -;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021-2025 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018 Mark H Weaver @@ -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)