diff options
| author | Milan Svoboda <milan.svoboda@centrum.cz> | 2019-04-20 23:30:13 +0200 |
|---|---|---|
| committer | Milan Svoboda <milan.svoboda@centrum.cz> | 2019-04-23 21:35:18 +0200 |
| commit | 2f59db4fa921af7a4f6c8f435eb29d3394fe2f7e (patch) | |
| tree | 9e5531ece991a0ecd573d41392a60aa7fdb4d031 /pkgs/misc/lilypond | |
| parent | ae50241871c7d8816eaccdeac0c7bf6d4a5394bd (diff) | |
Fix configure error - incorrectly detected fontforge version
Diffstat (limited to 'pkgs/misc/lilypond')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index f312cce19d74..fb17e5e5a2d7 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python2, gettext, flex, perl, bison, pkgconfig, dblatex +, python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fetchsvn, makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -23,17 +23,6 @@ stdenv.mkDerivation rec{ sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j"; }; - preConfigure='' - sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl - - # At some point our fontforge had path 2n…-fontforge-2015… and it - # confused the version detection… - sed -re 's%("[$]exe" --version .*)([|\\] *$)%\1 | sed -re "s@/nix/store/[a-z0-9]{32}-@@" \2%' \ - -i configure - - export HOME=$TMPDIR/home - ''; - postInstall = '' for f in "$out/bin/"*; do # Override default argv[0] setting so LilyPond can find @@ -46,13 +35,22 @@ stdenv.mkDerivation rec{ configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; + preConfigure = '' + sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl + export HOME=$TMPDIR/home + ''; + + nativeBuildInputs = [ makeWrapper pkgconfig autoreconfHook ]; + + autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; + buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python2 gettext flex perl bison pkgconfig fontconfig freetype pango - fontforge help2man groff makeWrapper t1utils + python2 gettext flex perl bison fontconfig freetype pango + fontforge help2man groff t1utils ]; - #enableParallelBuilding = true; # fatal error: parser.hh: No such file or directory + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Music typesetting system"; |