b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lilypond: Update to 2.16.2, fix guile.

Browse source
This commit is contained in:
Petr Rockai 2013-04-21 09:24:55 +02:00 committed by Vladimír Čunát
parent 52f38ce5d6
commit dd23b30120
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/misc/lilypond/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex , python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, fetchsvn }: , fetchsvn, makeWrapper }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
majorVersion="2.14"; majorVersion="2.16";
minorVersion="2"; minorVersion="2";
version="${majorVersion}.${minorVersion}"; version="${majorVersion}.${minorVersion}";
name = "lilypond-${version}"; name = "lilypond-${version}";
@ -16,21 +16,23 @@ stdenv.mkDerivation rec{
src = fetchurl { src = fetchurl {
url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
# 2.15.42 sha256 = "1jx11bk3rk3w7bnh0829yy280627ywsvwg6fhdm0fqwkiz7jchqz";
# sha256 = "0cm2fq1cr9d24w5xkz6ik6qnby516dfahz4cw47xx8mb5qsa4drd";
sha256 = "15i6k3fjc29wvchayn31khxhpppzd4g6ivbk7l43fakj8lw6nfi4";
}; };
preConfigure='' preConfigure=''
sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl
''; '';
postInstall = ''
for f in $out/bin/*; do wrapProgram $f --set GUILE_AUTO_COMPILE 0; done
'';
configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"];
buildInputs = buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm
python gettext flex perl bison pkgconfig texLive fontconfig freetype pango python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
fontforge help2man groff fontforge help2man groff makeWrapper
]; ];
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View file

@ -9081,7 +9081,7 @@ let
lazylist = callPackage ../tools/typesetting/tex/lazylist { }; lazylist = callPackage ../tools/typesetting/tex/lazylist { };
lilypond = callPackage ../misc/lilypond { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
martyr = callPackage ../development/libraries/martyr { }; martyr = callPackage ../development/libraries/martyr { };