[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54615] [PATCH 1/2] gnu: spike: Substitute path to dtc instead of wr
From: |
Arun Isaac |
Subject: |
[bug#54615] [PATCH 1/2] gnu: spike: Substitute path to dtc instead of wrapping executables. |
Date: |
Tue, 29 Mar 2022 00:13:18 +0530 |
* gnu/packages/virtualization.scm (spike)[arguments]: Delete the wrap-binary
phase. Add a configure-dtc-path phase that substitutes the absolute path to
dtc.
---
gnu/packages/virtualization.scm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index bd297977df..9c86670ce7 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -26,6 +26,7 @@
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; 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 "\"" (assoc-ref inputs "dtc")
"/bin/dtc\""))))))))
(inputs
(list bash-minimal dtc))
(native-inputs
--
2.34.0