From 7c8dddb16f62af9d02c654232105795bbae173cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Dec 2021 01:27:23 +0100 Subject: gnu: ccache: Gexp arguments. * gnu/packages/ccache.scm (ccache)[arguments]: Rewrite as a keyword/gexp list. --- gnu/packages/ccache.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index a36de3af88..2923a998c8 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages ccache) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix download) @@ -45,24 +46,23 @@ (inputs (list zlib `(,zstd "lib"))) (arguments - '( ;; The Redis backend must be explicitly disabled to build without Redis. - #:configure-flags - '("-DREDIS_STORAGE_BACKEND=OFF") - - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-shell - ;; Run early whilst we're still in the source directory. - (lambda _ - (substitute* (list "test/run" - "test/suites/base.bash" - "unittest/test_hashutil.cpp") - (("compgen -e") "env | cut -d= -f1") - (("#!/bin/sh") (string-append "#!" (which "sh")))))) - (add-before 'check 'set-home - ;; Tests require a writable HOME. - (lambda _ - (setenv "HOME" (getenv "TMPDIR"))))))) + (list #:configure-flags + ;; The backend must be explicitly disabled to build without Redis. + #~(list "-DREDIS_STORAGE_BACKEND=OFF") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-shell + ;; Run early whilst we're still in the source directory. + (lambda _ + (substitute* (list "test/run" + "test/suites/base.bash" + "unittest/test_hashutil.cpp") + (("compgen -e") "env | cut -d= -f1") + (("#!/bin/sh") (string-append "#!" (which "sh")))))) + (add-before 'check 'set-home + ;; Tests require a writable HOME. + (lambda _ + (setenv "HOME" (getenv "TMPDIR"))))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- cgit v1.2.3