summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-19 16:37:05 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-19 16:37:05 +0100
commitc72aed6d8c000efcc4cd3a912b13773e9ed46453 (patch)
treef7fda7fa9fb8a50898a3417ba3364894f65f01b4
parentd35c5e29b6cae013aa0f4e8b075670010b9c9ce1 (diff)
gnu: emms: Let the build system install emms-print-metadata.1.
Reported by effa`` on #guix. * gnu/packages/emacs.scm (emms)[arguments] <pre-install>: Remove 'copy-file' invocation.
-rw-r--r--gnu/packages/emacs.scm12
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9ccf34c3622..f4d7ac97482 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1,6 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> 2;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
3;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> 3;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
4;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> 4;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
5;;; Copyright © 2014 Alex Kost <alezost@gmail.com> 5;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
6;;; 6;;;
@@ -482,13 +482,12 @@ operations.")
482 (alist-cons-before 482 (alist-cons-before
483 'install 'pre-install 483 'install 'pre-install
484 (lambda* (#:key outputs #:allow-other-keys) 484 (lambda* (#:key outputs #:allow-other-keys)
485 ;; The 'install' rule expects 'emms-print-metadata.1' to 485 ;; The 'install' rule expects the target directory to
486 ;; be already installed. 486 ;; exist.
487 (let* ((out (assoc-ref outputs "out")) 487 (let* ((out (assoc-ref outputs "out"))
488 (man1 (string-append out "/share/man/man1"))) 488 (man1 (string-append out "/share/man/man1")))
489 (mkdir-p man1) 489 (mkdir-p man1)
490 (copy-file "emms-print-metadata.1" 490 #t))
491 (string-append man1 "/emms-print-metadata.1"))))
492 (alist-cons-after 491 (alist-cons-after
493 'install 'post-install 492 'install 'post-install
494 (lambda* (#:key outputs #:allow-other-keys) 493 (lambda* (#:key outputs #:allow-other-keys)
@@ -505,8 +504,7 @@ operations.")
505 #:tests? #f)) 504 #:tests? #f))
506 (native-inputs `(("emacs" ,emacs) ;for (guix build emacs-utils) 505 (native-inputs `(("emacs" ,emacs) ;for (guix build emacs-utils)
507 ("texinfo" ,texinfo))) 506 ("texinfo" ,texinfo)))
508 (inputs `(;("perl" ,perl) ;for 'emms-print-metadata.pl' 507 (inputs `(("alsa-utils" ,alsa-utils)
509 ("alsa-utils" ,alsa-utils)
510 ("vorbis-tools" ,vorbis-tools) 508 ("vorbis-tools" ,vorbis-tools)
511 ("mpg321" ,mpg321) 509 ("mpg321" ,mpg321)
512 ("taglib" ,taglib) 510 ("taglib" ,taglib)