diff options
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/misc/lilypond/findlib.patch | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 67 insertions, 0 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix new file mode 100644 index 0000000000000..358401238e5de --- /dev/null +++ b/pkgs/misc/lilypond/default.nix @@ -0,0 +1,34 @@ +# note: there is a jedit plugin +args: with args; + +stdenv.mkDerivation { + name = "lilypond-2.13.3"; + + #src = sourceByName "lilypond"; + #preConfigure = "./autogen.sh"; + + src = fetchurl { + url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.3.tar.gz; + sha256 = "1ihnkgpd19q3sns7k6wvx4x1ccb1cw9ins3qasfs5n7srhc3cvac"; + }; + + configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"]; + # configureFlags = "--disable-documentation"; + + buildInputs = [ + automake autoconf + ghostscript texinfo imagemagick texi2html guile texinfo + python gettext flex perl bison pkgconfig texLive fontconfig freetype pango + fontforge help2man]; + + + meta = { + description = "music typesetting system"; + homepage = http://lilypond.org/; + license = "GPL"; + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; + }; + + patches = [ ./findlib.patch ]; +} diff --git a/pkgs/misc/lilypond/findlib.patch b/pkgs/misc/lilypond/findlib.patch new file mode 100644 index 0000000000000..30e130bc8ad84 --- /dev/null +++ b/pkgs/misc/lilypond/findlib.patch @@ -0,0 +1,24 @@ +diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make +index 3825101..bf37d16 100644 +--- a/stepmake/stepmake/executable-vars.make ++++ b/stepmake/stepmake/executable-vars.make +@@ -1,4 +1,4 @@ +-MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) ++MODULE_LIBES =$(addprefix , $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) + LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(CONFIG_LIBS) + + EXECUTABLE = $(outdir)/$(NAME) + +diff --git a/make/stepmake.make b/make/stepmake.make +index 604341b..7f0d9d8 100644 +--- a/make/stepmake.make ++++ b/make/stepmake.make +@@ -87,7 +87,7 @@ outdir=$(outroot)/$(outbase) + config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh + + # The outdir that was configured for: best guess to find binaries +-outconfbase=out$(CONFIGSUFFIX) ++outconfbase=$(outdir) + outconfdir=$(outroot)/$(outconfbase) + + # user package diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2c8183d6c72..353d1790809cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8002,6 +8002,15 @@ let inherit fetchurl stdenv tetex; }; + lilypond = import ../misc/lilypond { + inherit (bleedingEdgeRepos) sourceByName; + inherit fetchurl stdenv lib automake autoconf + ghostscript texinfo imagemagick texi2html guile python gettext + perl bison pkgconfig texLive fontconfig freetype fontforge help2man; + inherit (gtkLibs) pango; + flex = flex2535; + }; + linuxwacom = import ../misc/linuxwacom { inherit fetchurl stdenv ncurses pkgconfig; inherit (xorg) libX11 libXi xproto inputproto xorgserver; |