unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Theodoros Foradis <theodoros.for@openmailbox.org>
To: guix-devel@gnu.org
Subject: [PATCH 1/1] gnu: icestorm: Replace reference in icebox_vlog.
Date: Sat, 14 Jan 2017 20:56:52 +0200	[thread overview]
Message-ID: <20170114185652.29952-2-theodoros.for@openmailbox.org> (raw)
In-Reply-To: <20170114185652.29952-1-theodoros.for@openmailbox.org>

* gnu/packages/fpga.scm (icestorm)[arguments]: Modify phases
"fix-usr-local" to replace reference to /usr/local/share.
---
 gnu/packages/fpga.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index f65eae8..eb05a39 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -225,11 +225,12 @@ For synthesis, the compiler generates netlists in the desired format.")
                           (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
         (modify-phases %standard-phases
-          (add-after 'unpack 'remove-usr-local
-            (lambda _
-              (substitute* "iceprog/Makefile"
+          (add-after 'unpack 'fix-usr-local
+            (lambda* (#:key outputs #:allow-other-keys)
+              (substitute* '("iceprog/Makefile" "icebox/icebox_vlog.py")
                 (("-I/usr/local/include") "")
-                (("-L/usr/local/lib") ""))
+                (("-L/usr/local/lib") "")
+                (("/usr/local/share") (string-append (assoc-ref outputs "out") "/share")))
               #t))
           (delete 'configure))))
     (inputs
-- 
2.10.2

  reply	other threads:[~2017-01-14 19:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-14 18:56 [PATCH 0/1] gnu: icestorm: Replace reference in icebox_vlog Theodoros Foradis
2017-01-14 18:56 ` Theodoros Foradis [this message]
2017-01-14 19:25   ` [PATCH 1/1] " Danny Milosavljevic
2017-01-16 10:11     ` Theodoros Foradis
2017-01-16 14:21       ` Danny Milosavljevic
2017-01-17 20:53         ` Leo Famulari
2017-03-10 19:22           ` Theodoros Foradis
2017-03-10 21:13             ` Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170114185652.29952-2-theodoros.for@openmailbox.org \
    --to=theodoros.for@openmailbox.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).