From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVIbZ-0004eX-HD for guix-patches@gnu.org; Wed, 12 Jul 2017 10:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVIbW-0002om-TR for guix-patches@gnu.org; Wed, 12 Jul 2017 10:27:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:32801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVIbW-0002nC-KM for guix-patches@gnu.org; Wed, 12 Jul 2017 10:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dVIbW-0003Yi-Bs for guix-patches@gnu.org; Wed, 12 Jul 2017 10:27:02 -0400 Subject: [bug#27657] [PATCH 1/3] gnu: graphviz: Use modify-phases. References: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> In-Reply-To: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> Resent-Message-ID: Message-Id: From: Arun Isaac Date: Wed, 12 Jul 2017 19:55:54 +0530 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27657@debbugs.gnu.org * gnu/packages/graphviz.scm (graphviz): Re-indent. [arguments]: Use modify-phases instead of alist-cons-before and alist-cons-after. --- gnu/packages/graphviz.scm | 77 +++++++++++++++++++++++--------------------= ---- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index d47d45e52..f236788e0 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -46,49 +46,48 @@ (name "graphviz") (version "2.38.0") (source (origin - (method url-fetch) - (uri (string-append - "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-= " - version ".tar.gz")) - (sha256 - (base32 - "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1")))) + (method url-fetch) + (uri (string-append + "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz= -" + version ".tar.gz")) + (sha256 + (base32 + "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1")))) (build-system gnu-build-system) (arguments ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. '(#:tests? #f - - #:phases (alist-cons-before - 'build 'pre-build - (lambda _ - ;; Work around bogus makefile when using an external - ;; libltdl. Failing to do so, one hits this error: - ;; "No rule to make target `-lltdl', needed by `libgvc.= la'." - (substitute* "lib/gvc/Makefile" - (("am__append_5 *=3D.*") - "am_append_5 =3D\n"))) - (alist-cons-after - 'install 'move-docs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share/graphviz"= )) - (rename-file (string-append out "/share/graph= viz/doc") - (string-append doc "/share/graph= viz/doc")) - #t)) - (alist-cons-after - 'move-docs 'move-guile-bindings - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (extdir (string-append lib - "/guile/2.0/extensions"= ))) - (mkdir-p extdir) - (rename-file (string-append - lib "/graphviz/guile/libgv_guile.so") - (string-append extdir - "/libgv_guile.so")))) - %standard-phases))))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + ;; Work around bogus makefile when using an external + ;; libltdl. Failing to do so, one hits this error: + ;; "No rule to make target `-lltdl', needed by `libgvc.la'." + (substitute* "lib/gvc/Makefile" + (("am__append_5 *=3D.*") + "am_append_5 =3D\n")))) + (add-after + 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/graphviz")) + (rename-file (string-append out "/share/graphviz/doc") + (string-append doc "/share/graphviz/doc")) + #t))) + (add-after + 'move-docs 'move-guile-bindings + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (extdir (string-append lib + "/guile/2.0/extensions"))) + (mkdir-p extdir) + (rename-file (string-append + lib "/graphviz/guile/libgv_guile.so") + (string-append extdir + "/libgv_guile.so")))))))) (inputs `(("libXrender" ,libxrender) ("libX11" ,libx11) --=20 2.12.2 =