From b8e912c35f03289cca711b8d9192bf7b815b4d81 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Tue, 9 May 2023 16:30:07 +0200 Subject: [PATCH] gnu: barrier: Include NULL compatibility. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by * gnu/packages/barrier.scm (barrier)[arguments]: Use G-exp, add phases including NULL macro. Signed-off-by: Ludovic Courtès --- gnu/packages/barrier.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/barrier.scm b/gnu/packages/barrier.scm index 5c2ecb0f2f..be0e52349b 100644 --- a/gnu/packages/barrier.scm +++ b/gnu/packages/barrier.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Mathieu Othacehe +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (gnu packages barrier) #:use-module (guix build-system cmake) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) @@ -48,9 +50,17 @@ (base32 "19bwa9qidq2mxv1fkyxxc1xdmv3jx6bj35bkaaw70jzkblnfmlfs")))) (build-system cmake-build-system) (arguments - '(#:configure-flags - (list "-DBARRIER_USE_EXTERNAL_GTEST=ON") - #:tests? #f)) ;tests require a running x server + (list + #:configure-flags + #~(list "-DBARRIER_USE_EXTERNAL_GTEST=ON") + #:tests? #f ;; tests require a running x server + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-null + (lambda _ + (substitute* "src/lib/base/Event.h" + (("#include \"common/stdmap\\.h\"") + "#include \"common/stdmap.h\"\n#include "))))))) (native-inputs (list googletest pkg-config)) (inputs