~ruther/guix-local: gnu: verilator: Fix environment.

829d136a906bde12467bee556ecc728ae150e6a8 — Cayetano Santos 7 months ago f4c332b

gnu: verilator: Fix environment.

* gnu/packages/fpga.scm (verilator)[inputs]: Remove perl and python; add numactl.
[native-inputs]: Remove which; add perl.
[arguments]<#:phases>{set-SYSTEMC}: Set SYSTEMC_LIBDIR and
SYSTEMC_INCLUDE.

Change-Id: I2f01c7d00de3a65d4235bf804c1be503b5b5f6f3

patch browse .tar.gz

1 files changed, 10 insertions(+), 5 deletions(-)

M gnu/packages/fpga.scm

M gnu/packages/fpga.scm => gnu/packages/fpga.scm +10 -5

@@ 813,11 813,11 @@ using different abstraction levels.")
            gdb/pinned
            gettext-minimal
            help2man
+           perl
            python-distro
-           python-minimal
-           which))
+           python-minimal))
     (inputs
-     (list perl python systemc))
+     (list numactl systemc))
     (build-system gnu-build-system)
     (arguments
      (list


@@ 829,9 829,14 @@ using different abstraction levels.")
             (lambda _
               (substitute* "bin/verilator"
                 (("/bin/echo") "echo"))))
-          (add-before 'check 'set-SYSTEMC_ROOT
+          (add-before 'configure 'set-SYSTEMC
             (lambda _
-              (setenv "SYSTEMC_ROOT" #$(this-package-input systemc))))
+              (setenv "SYSTEMC_LIBDIR"
+                      (string-append
+                       #$(this-package-input "systemc") "/lib"))
+              (setenv "SYSTEMC_INCLUDE"
+                      (string-append
+                       #$(this-package-input "systemc") "/include"))))
           (add-before 'check 'disable-gdb-safe-path
             (lambda _
               (setenv "HOME" (getcwd))