From 98e470d0a5c58dcdae35846de20a18a4916d9d9c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Nov 2024 14:18:43 +0900 Subject: gnu: yosys: Remove extraneous characters. * gnu/packages/fpga.scm (yosys) [arguments]: Drop leading './' from file names. Drop leading '/' from file names given to 'search-input-file'. Change-Id: I49febe7bcf0d60553d2a24d99746e6457fa4d03f --- gnu/packages/fpga.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 8d7b0a8dd1..c3b6030fb1 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -171,30 +171,29 @@ For synthesis, the compiler generates netlists in the desired format.") #~(modify-phases %standard-phases (add-before 'configure 'fix-paths (lambda* (#:key inputs #:allow-other-keys) - (substitute* "./backends/smt2/smtio.py" + (substitute* "backends/smt2/smtio.py" (("\\['z3") - (string-append "['" (search-input-file inputs "/bin/z3")))) - (substitute* "./kernel/fstdata.cc" + (string-append "['" (search-input-file inputs "bin/z3")))) + (substitute* "kernel/fstdata.cc" (("vcd2fst") - (search-input-file inputs "/bin/vcd2fst"))) - (substitute* '("./passes/cmds/show.cc" - "./passes/cmds/viz.cc") + (search-input-file inputs "bin/vcd2fst"))) (substitute* "kernel/driver.cc" (("^#include \"libs/cxxopts/include/cxxopts.hpp\"") "#include ")) + (substitute* '("passes/cmds/show.cc" + "passes/cmds/viz.cc") (("exec xdot") - (string-append "exec " (search-input-file inputs - "/bin/xdot"))) + (string-append "exec " (search-input-file inputs "bin/xdot"))) (("dot -") - (string-append (search-input-file inputs "/bin/dot") " -")) + (string-append (search-input-file inputs "bin/dot") " -")) (("fuser") - (search-input-file inputs "/bin/fuser"))))) + (search-input-file inputs "bin/fuser"))))) (replace 'configure (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "config-gcc" make-flags))) (add-after 'configure 'use-external-abc (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("./Makefile") + (substitute* '("Makefile") (("ABCEXTERNAL \\?=") (string-append "ABCEXTERNAL = " (search-input-file inputs "/bin/abc")))))) -- cgit v1.2.3