guix-commits
[Top][All Lists]
Advanced

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

25/30: gnu: kcov: Prepare for cross-compilation.


From: guix-commits
Subject: 25/30: gnu: kcov: Prepare for cross-compilation.
Date: Fri, 26 Nov 2021 18:53:12 -0500 (EST)

nckx pushed a commit to branch master
in repository guix.

commit c6e99f78f0f8c9d4da11162acd55ec73c8625641
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Nov 26 22:22:08 2021 +0100

    gnu: kcov: Prepare for cross-compilation.
    
    * gnu/packages/code.scm (kcov)[arguments]: Look up bash in the inputs.
---
 gnu/packages/code.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 8804173..29479ca 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -588,10 +588,11 @@ results and determine build stability.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-/bin/bash-references
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((bash (assoc-ref inputs "bash")))
              (substitute* (find-files "src" ".*\\.cc?$")
-               (("/bin/bash") (which "bash"))
-               (("/bin/sh") (which "sh"))))))))
+               (("/bin/(bash|sh)" shell)
+                (string-append (assoc-ref inputs "bash") shell)))))))))
     (inputs
      `(("curl" ,curl)
        ("elfutils" ,elfutils)



reply via email to

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