diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
| commit | aeafff536f933b07836b14d089dfc52b0e432ec9 (patch) | |
| tree | 4ede554999f98cf9e19c04098c934db52efae795 /gnu/packages/moreutils.scm | |
| parent | 9dee9e8ffe4650949bd3ad2edf559cf4a33e9e6e (diff) | |
| parent | f82c58539e1f7b9b864e68ea2ab0c6a17c15fbb5 (diff) | |
| download | guix-aeafff536f933b07836b14d089dfc52b0e432ec9.tar guix-aeafff536f933b07836b14d089dfc52b0e432ec9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/moreutils.scm')
| -rw-r--r-- | gnu/packages/moreutils.scm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm index eebb20790d..79e2a42762 100644 --- a/gnu/packages/moreutils.scm +++ b/gnu/packages/moreutils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,7 @@ (define-public moreutils (package (name "moreutils") - (version "0.57") + (version "0.58") (source (origin (method url-fetch) (uri (string-append @@ -36,7 +37,7 @@ version ".orig.tar.gz")) (sha256 (base32 - "078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s")))) + "02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww")))) (build-system gnu-build-system) (inputs `(("perl" ,perl) ("libxml2" ,libxml2) @@ -45,18 +46,17 @@ ("docbook-xsl" ,docbook-xsl))) (arguments `(#:phases - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys) - (use-modules (srfi srfi-1)) - (substitute* "Makefile" - (("/usr/share/xml/.*/docbook.xsl") - (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) - (files (find-files docbook-xsl "^docbook\\.xsl$"))) - (find (lambda (file) - (string-suffix? "/manpages/docbook.xsl" file)) - files))))) - %standard-phases) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (use-modules (srfi srfi-1)) + (substitute* "Makefile" + (("/usr/share/xml/.*/docbook.xsl") + (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) + (files (find-files docbook-xsl "^docbook\\.xsl$"))) + (find (lambda (file) + (string-suffix? "/manpages/docbook.xsl" file)) + files))))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc"))) |