guix-commits
[Top][All Lists]
Advanced

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

15/16: gnu: lilypond: Build info pages with images.


From: Ricardo Wurmus
Subject: 15/16: gnu: lilypond: Build info pages with images.
Date: Thu, 24 Dec 2015 09:11:17 +0000

rekado pushed a commit to branch master
in repository guix.

commit 409be57b091e6cb8cb19e668eac09832caa780de
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Dec 24 09:53:07 2015 +0100

    gnu: lilypond: Build info pages with images.
    
    * gnu/packages/music.scm (lilypond)[arguments]: Set "conf" and "out" to
      "www"; rename phase "hardcode-path-to-gs" to "fix-path-references";
      fix reference to "/bin/sh"; add phase "install-info".
---
 gnu/packages/music.scm |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 14590f4..8ae9bc0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -268,27 +268,34 @@ you to define complex tempo maps for entire songs or 
performances.")
     (arguments
      `(#:tests? #f ; out-test/collated-files.html fails
        #:out-of-source? #t
+       #:make-flags '("conf=www") ;to generate images for info manuals
        #:configure-flags
-       (list (string-append "--with-texgyre-dir="
+       (list "CONFIGURATION=www"
+             (string-append "--with-texgyre-dir="
                             (assoc-ref %build-inputs "font-tex-gyre")
                             "/share/fonts/opentype/"))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'hardcode-path-to-gs
-          (lambda* (#:key inputs #:allow-other-keys)
+         (add-after 'unpack 'fix-path-references
+          (lambda _
             (substitute* "scm/backend-library.scm"
               (("\\(search-executable '\\(\"gs\"\\)\\)")
-               (string-append "\""
-                              (assoc-ref inputs "ghostscript")
-                              "/bin/gs"
-                              "\"" )))
+               (string-append "\"" (which "gs") "\""))
+              (("\"/bin/sh\"")
+               (string-append "\"" (which "sh") "\"")))
             #t))
          (add-before 'configure 'prepare-configuration
           (lambda _
             (substitute* "configure"
               (("SHELL=/bin/sh") "SHELL=sh"))
-            (setenv "out" "")
-            #t)))))
+            (setenv "out" "www")
+            (setenv "conf" "www")
+            #t))
+         (add-after 'install 'install-info
+           (lambda _
+             (zero? (system* "make"
+                             "-j" (number->string (parallel-job-count))
+                             "conf=www" "install-info")))))))
     (inputs
      `(("guile" ,guile-1.8)
        ("font-dejavu" ,font-dejavu)



reply via email to

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