From: Kei Kebreau <kei@openmailbox.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add denemo.
Date: Sun, 11 Dec 2016 17:49:07 -0500 [thread overview]
Message-ID: <8737hu5bfg.fsf@openmailbox.org> (raw)
In-Reply-To: <87h96asukd.fsf@elephly.net> (Ricardo Wurmus's message of "Sun, 11 Dec 2016 10:07:14 +0100")
[-- Attachment #1.1: Type: text/plain, Size: 439 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Indeed it is not. I've removed these inputs from the new patch. As a
>> side note, lilypond was required as a runtime dependency so I moved it
>> to propagated-inputs.
>
> Do you think it would be possible to patch the sources to refer to the
> Lilypond executable instead of propagating the input?
Good idea! Does this patch look good to you?
[-- Attachment #1.2: 0001-gnu-denemo-Change-default-preferences-to-use-the-alr.patch --]
[-- Type: text/plain, Size: 2258 bytes --]
From a52e6b330b6bd9f136d9c3c750b5c6dff0306ee0 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sun, 11 Dec 2016 17:23:32 -0500
Subject: [PATCH] gnu: denemo: Change default preferences to use the
already-present lilypond.
* gnu/packages/music.scm (denemo)[progpagated-inputs]: Move lilypond to ...
[inputs]: ... here.
[phases]: New phase set-lilypond.
---
gnu/packages/music.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 116e8d482..4297f846f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -251,6 +251,18 @@ many input formats and provides a customisable Vi-style user interface.")
;; testsuite.
(lambda _
(zero? (system* "make" "-C" "tests" "check"))))
+ (add-before 'build 'set-lilypond
+ ;; This phase sets the default path for lilypond to its current
+ ;; location in the store.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((lilypond (string-append (assoc-ref inputs "lilypond")
+ "/bin/lilypond")))
+ (substitute* "src/core/prefops.c"
+ (("g_string_new \\(\"lilypond\"\\);")
+ (string-append "g_string_new (\""
+ lilypond
+ "\");"))))
+ #t))
(add-after 'install 'correct-filename
;; "graft-derivation/shallow" from the (guix grafts) module runs in
;; the C locale, expecting file names to be ASCII encoded. This
@@ -283,11 +295,10 @@ many input formats and provides a customisable Vi-style user interface.")
("libsndfile" ,libsndfile)
("libtool" ,libtool)
("libxml2" ,libxml2)
+ ("lilypond", lilypond)
("portaudio" ,portaudio)
("portmidi" ,portmidi)
("rubberband" ,rubberband)))
- (propagated-inputs
- `(("lilypond", lilypond)))
(synopsis "Graphical music notation, front-end to GNU Lilypond")
(description
"GNU Denemo is a music notation editor that provides a convenient
--
2.11.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2016-12-11 22:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-08 19:09 [PATCH] gnu: Add denemo Kei Kebreau
2016-12-09 21:43 ` Ludovic Courtès
2016-12-09 22:33 ` Ludovic Courtès
2016-12-10 3:09 ` Kei Kebreau
2016-12-11 0:04 ` Ludovic Courtès
2016-12-11 9:07 ` Ricardo Wurmus
2016-12-11 22:49 ` Kei Kebreau [this message]
2016-12-12 6:32 ` Ricardo Wurmus
-- strict thread matches above, loose matches on Subject: below --
2016-07-06 22:44 Kei Kebreau
2016-07-07 7:14 ` Ricardo Wurmus
2016-07-07 13:46 ` Kei Kebreau
2016-07-08 6:45 ` Ricardo Wurmus
2016-07-10 15:34 ` Kei Kebreau
2016-07-16 18:50 ` Kei Kebreau
2016-07-16 19:13 ` Ricardo Wurmus
2016-07-16 20:02 ` Kei Kebreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8737hu5bfg.fsf@openmailbox.org \
--to=kei@openmailbox.org \
--cc=guix-devel@gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).