From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add denemo. Date: Sun, 11 Dec 2016 17:49:07 -0500 Message-ID: <8737hu5bfg.fsf@openmailbox.org> References: <87r35ikzjw.fsf@openmailbox.org> <87eg1g7p8n.fsf@gnu.org> <87twaciipd.fsf@openmailbox.org> <87h96asukd.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGCvv-0004xw-8f for guix-devel@gnu.org; Sun, 11 Dec 2016 17:49:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGCvr-0001kg-19 for guix-devel@gnu.org; Sun, 11 Dec 2016 17:49:27 -0500 In-Reply-To: <87h96asukd.fsf@elephly.net> (Ricardo Wurmus's message of "Sun, 11 Dec 2016 10:07:14 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ricardo Wurmus Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Ricardo Wurmus writes: > Kei Kebreau 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? --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-denemo-Change-default-preferences-to-use-the-alr.patch Content-Transfer-Encoding: quoted-printable From=20a52e6b330b6bd9f136d9c3c750b5c6dff0306ee0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau 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. =2D-- 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 =2D-- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -251,6 +251,18 @@ many input formats and provides a customisable Vi-styl= e 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 run= s in ;; the C locale, expecting file names to be ASCII encoded. This @@ -283,11 +295,10 @@ many input formats and provides a customisable Vi-sty= le user interface.") ("libsndfile" ,libsndfile) ("libtool" ,libtool) ("libxml2" ,libxml2) + ("lilypond", lilypond) ("portaudio" ,portaudio) ("portmidi" ,portmidi) ("rubberband" ,rubberband))) =2D (propagated-inputs =2D `(("lilypond", lilypond))) (synopsis "Graphical music notation, front-end to GNU Lilypond") (description "GNU Denemo is a music notation editor that provides a convenient =2D-=20 2.11.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlhN1+MACgkQ5qXuPBlG eg1VPw/9E533gyd3mO69lvbji5TMjvfXE/7/Uv4Fh+oeuI+vWI/y8nGcAI3riyiD CeFyyfjRrml0i6Dt0V+33g68RWCxlUaz9iwotkr3I6vy8/m9g2z/Utmbsh3WxjlV 1YpkVB50sZRDtx444xKXVS53KesRC0tbs4uSaFpqVTpTDpcRzINPqdf4BvKLCfs0 4z1jS8VmZYHkMY4zvNaNRvTpLbKB/XXVxNAstLYHXPr29NPgVipueBmK+xTj+hyE /zbgjbn7Wcf5apIQYvNfFUzHDB33ewIz5EEl6n3RMMSabYQdKmuq0oj86iH360mI 2YASOJewLm36uy5dVvr9GOR6W93DOk2/ixQea2Ov/GdJZSzzQwBWUpSfyjSC450Y vzVcscHARuaZsGoR+k30xfMJ5uoxJRt5wA5J/ZtO1z+EodepjCgXz55pRzcIWHt1 o7Xb0kBg+D8ofwjSpt+Go7NL9G13AYA3H4+UdO3RKK/x1XVoFmJBD+Co9KbGrJcU Yxw49+GsYTC1hGFdQ/BYhWnPGL8LgLJ5JwmGPk7kd7pCShi7NRV36z0jlWIeYx/c 0qUadVz7oTjUVrPt3VSt/sg9/zkn6sNX57g4Wk3lH8SnEK+5ncWbunPK1DCSn+wO RD/56XYiUFVBqGszrdr/7EySNAdbqyt69phtekyH0bptRXO5sLk= =RC41 -----END PGP SIGNATURE----- --==-=-=--