03/04: gnu: arachne-pnr: Fix tests.

[guix-commits]

dannym pushed a commit to branch master
in repository guix.

commit eccd3f6d2ef09fcfccf5e4e09be13b79089c60d1
Author: Danny Milosavljevic <address@hidden>
Date:   Tue Jan 15 13:56:49 2019 +0100

    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(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 4646d32..46edda0 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"))