me
/
guix
Archived
1
0
Fork 0
Code

gnu: barrier: Include NULL compatibility. 

Fixes <https://bugs.gnu.org/63244>.
Reported by <john@fremlin.org>

* gnu/packages/barrier.scm (barrier)[arguments]: Use G-exp, add phases
including NULL macro.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Simon Tournier 2023-05-09 16:30:07 +02:00 committed by Ludovic Courtès
parent 92a7817fcb
commit b8e912c35f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/barrier.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -19,6 +20,7 @@
(define-module (gnu packages barrier) (define-module (gnu packages barrier)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -48,9 +50,17 @@
(base32 "19bwa9qidq2mxv1fkyxxc1xdmv3jx6bj35bkaaw70jzkblnfmlfs")))) (base32 "19bwa9qidq2mxv1fkyxxc1xdmv3jx6bj35bkaaw70jzkblnfmlfs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags (list
(list "-DBARRIER_USE_EXTERNAL_GTEST=ON") #:configure-flags
#:tests? #f)) ;tests require a running x server #~(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 <cstddef>")))))))
(native-inputs (native-inputs
(list googletest pkg-config)) (list googletest pkg-config))
(inputs (inputs