guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: emms: Let the build system install emms-print-metadata.1.


From: Ludovic Courtès
Subject: 02/02: gnu: emms: Let the build system install emms-print-metadata.1.
Date: Mon, 19 Jan 2015 15:37:20 +0000

civodul pushed a commit to branch master
in repository guix.

commit c72aed6d8c000efcc4cd3a912b13773e9ed46453
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 19 16:37:05 2015 +0100

    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.
---
 gnu/packages/emacs.scm |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9ccf34c..f4d7ac9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <address@hidden>
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014 Mark H Weaver <address@hidden>
 ;;; Copyright © 2014 Alex Kost <address@hidden>
 ;;;
@@ -482,13 +482,12 @@ operations.")
                  (alist-cons-before
                   'install 'pre-install
                   (lambda* (#:key outputs #:allow-other-keys)
-                    ;; The 'install' rule expects 'emms-print-metadata.1' to
-                    ;; be already installed.
+                    ;; The 'install' rule expects the target directory to
+                    ;; exist.
                     (let* ((out  (assoc-ref outputs "out"))
                            (man1 (string-append out "/share/man/man1")))
                       (mkdir-p man1)
-                      (copy-file "emms-print-metadata.1"
-                                 (string-append man1 
"/emms-print-metadata.1"))))
+                      #t))
                   (alist-cons-after
                    'install 'post-install
                    (lambda* (#:key outputs #:allow-other-keys)
@@ -505,8 +504,7 @@ operations.")
        #:tests? #f))
     (native-inputs `(("emacs" ,emacs)            ;for (guix build emacs-utils)
                      ("texinfo" ,texinfo)))
-    (inputs `(;("perl" ,perl)                     ;for 'emms-print-metadata.pl'
-              ("alsa-utils" ,alsa-utils)
+    (inputs `(("alsa-utils" ,alsa-utils)
               ("vorbis-tools" ,vorbis-tools)
               ("mpg321" ,mpg321)
               ("taglib" ,taglib)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]