From 9afad0c16ee4074af30fcf6afeafd5243bdab886 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 29 Mar 2022 16:13:02 +0530 Subject: gnu: spike: Substitute path to dtc instead of wrapping executables. * gnu/packages/virtualization.scm (spike)[arguments]: Delete the wrap-binary phase. Add a configure-dtc-path phase that substitutes the absolute path to dtc. Signed-off-by: Efraim Flashner --- gnu/packages/virtualization.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bd297977df..4c0f02154c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov ;;; Copyright © 2022 Ekaitz Zarraga +;;; Copyright © 2022 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1037,15 +1038,12 @@ (define-public spike (list #:phases #~(modify-phases %standard-phases - (add-after 'install 'wrap-binary - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (file) - (wrap-program file - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "/bin/dtc")))))) - (find-files (string-append out "/bin"))))))))) + (add-before 'configure 'configure-dtc-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Reference dtc by its absolute store path. + (substitute* "riscv/dts.cc" + (("DTC") + (string-append "\"" (search-input-file inputs "/bin/dtc") "\"")))))))) (inputs (list bash-minimal dtc)) (native-inputs -- cgit v1.2.3