From eccd3f6d2ef09fcfccf5e4e09be13b79089c60d1 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 15 Jan 2019 13:56:49 +0100 Subject: gnu: arachne-pnr: Fix tests. * gnu/packages/fpga.scm (arachne-pnr)[arguments]: Add #:make-flags. <#:phases>[configure]: Remove Makefile substitution. --- gnu/packages/fpga.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 4646d3241d..46edda02d2 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -274,16 +274,14 @@ Includes the actual FTDI connector.") (build-system gnu-build-system) (arguments `(#:test-target "test" + #:make-flags + (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) + (string-append "ICEBOX=" (string-append + (assoc-ref %build-inputs "icestorm") + "/share/icebox"))) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs inputs #:allow-other-keys) - (substitute* '("Makefile") - (("DESTDIR = .*") (string-append "DESTDIR = " - (assoc-ref outputs "out") - "\n")) - (("ICEBOX = .*") (string-append "ICEBOX = " - (assoc-ref inputs "icestorm") - "/share/icebox\n"))) (substitute* '("./tests/fsm/generate.py" "./tests/combinatorial/generate.py") (("#!/usr/bin/python") "#!/usr/bin/python2")) -- cgit v1.2.3