guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/09: gnu: bcachefs-tools: Only build with valgrind on supported system


From: guix-commits
Subject: 05/09: gnu: bcachefs-tools: Only build with valgrind on supported systems.
Date: Tue, 12 Jul 2022 10:41:48 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit f58ba4031ffc73fbb0b1d1940229267bb1dd41f9
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Jul 12 15:02:11 2022 +0300

    gnu: bcachefs-tools: Only build with valgrind on supported systems.
    
    * gnu/packages/file-systems.scm (bcachefs-tools)[native-inputs]: Only
    add valgrind on systems where valgrind is supported.
---
 gnu/packages/file-systems.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 9f6ca10831..d77d3be068 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
@@ -447,13 +447,16 @@ from a mounted file system.")
                                   (string-append #$util-linux        
"/bin"))))))))
              #:tests? #f))                  ; XXX 6 valgrind tests fail
       (native-inputs
-       (list pkg-config
-             ;; For tests.
-             python-pytest
-             valgrind
-             ;; For generating documentation with rst2man.
-             python
-             python-docutils))
+       (append
+         (list pkg-config
+               ;; For tests.
+               python-pytest)
+         (if (member (%current-system) (package-supported-systems valgrind))
+           (list valgrind)
+           '())
+         ;; For generating documentation with rst2man.
+         (list python
+               python-docutils)))
       (inputs
        (list eudev
              keyutils



reply via email to

[Prev in Thread] Current Thread [Next in Thread]