Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0e5dca23576
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a8d764486a5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 23, 2019

  1. Fix configure error - incorrectly detected fontforge version

    @tex
    tex committed Apr 23, 2019
    Copy the full SHA
    2f59db4 View commit details

  2. Merge pull request #59937 from tex/lilypond 

    LilyPond: Fix configure error - incorrectly detected fontforge version
    @infinisil
    infinisil authored Apr 23, 2019
    Copy the full SHA
    9a8d764 View commit details
Showing with 13 additions and 15 deletions.
  1. +13 −15 pkgs/misc/lilypond/default.nix
28 changes: 13 additions & 15 deletions pkgs/misc/lilypond/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";