From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodoros Foradis Subject: [PATCH 2/3] gnu: yosys: Add xdot functionality. Date: Sat, 26 Nov 2016 16:27:57 +0200 Message-ID: <20161126142758.25457-3-theodoros.for@openmailbox.org> References: <20161126142758.25457-1-theodoros.for@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAe2P-0006Or-PM for guix-devel@gnu.org; Sat, 26 Nov 2016 09:33:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAe2N-0005Rq-La for guix-devel@gnu.org; Sat, 26 Nov 2016 09:33:09 -0500 Received: from smtp21.openmailbox.org ([62.4.1.55]:45588 helo=smtp6.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cAe2N-0005Ra-Fr for guix-devel@gnu.org; Sat, 26 Nov 2016 09:33:07 -0500 In-Reply-To: <20161126142758.25457-1-theodoros.for@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/fpga.scm (yosys)[inputs]: Add xdot, graphviz and psmisc. [arguments]Add phase that patches paths. --- gnu/packages/fpga.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index bb19909..a344e8e 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016 Danny Milosavljevic +;;; Copyright =C2=A9 2016 Theodoros Foradis ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,9 @@ #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages gtk) + #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) + #:use-module (gnu packages linux) #:use-module (gnu packages zip) #:use-module (gnu packages perl) #:use-module (gnu packages ghostscript) @@ -136,6 +139,13 @@ For synthesis, the compiler generates netlists in th= e desired format.") (string-append "PREFIX=3D" %output)) #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-paths + (lambda _ + (substitute* "./passes/cmds/show.cc" + (("exec xdot") (string-append "exec " (which "xdot"))) + (("dot -") (string-append (which "dot") " -")) + (("fuser") (which "fuser"))) + #t)) (replace 'configure (lambda* (#:key inputs (make-flags '()) #:allow-other-keys) (zero? (apply system* "make" "config-gcc" make-flags)))) @@ -172,7 +182,6 @@ For synthesis, the compiler generates netlists in the= desired format.") (("iverilog_bin=3D\".*\"") (string-append "iveri= log_bin=3D\"" iverilog= "\""))) #t)))))) - ;; TODO add xdot [patch the path to it here] as soon as I find out w= here it is. (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python) @@ -185,6 +194,9 @@ For synthesis, the compiler generates netlists in the= desired format.") `(("tcl" ,tcl) ("readline" ,readline) ("libffi" ,libffi) + ("graphviz" ,graphviz) + ("psmisc" ,psmisc) + ("xdot" ,xdot) ("abc" ,abc))) (home-page "http://www.clifford.at/yosys/") (synopsis "FPGA Verilog RTL synthesizer") --=20 2.10.2