diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-23 01:57:36 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 01:40:50 +0100 |
| commit | eb928bae95237e22a07d6c4891d76ea73c29fd48 (patch) | |
| tree | fce6db70961b3448dc9cff70ec0356266b8cd844 /pkgs | |
| parent | 6dc20477e9df10d9e1343eb0b3e88c09fe4c788b (diff) | |
| download | nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar.gz nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar.bz2 nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar.lz nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar.xz nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.tar.zst nixlib-eb928bae95237e22a07d6c4891d76ea73c29fd48.zip | |
lilypond, denemo: migrate to guile 3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/denemo/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 80018ecc395b..ed4460a28322 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchurl, pkg-config -, libjack2, gettext, intltool, guile_2_2, lilypond +{ lib, stdenv, fetchurl, fetchpatch, pkg-config +, libjack2, gettext, intltool, guile, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband +, autoreconfHook, gtk-doc , portaudio, portmidi, fftw, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,8 +14,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-S+WXDGmEf5fx+HYnXJdE5QNOfJg7EqEEX7IMI2SUtV0="; }; + patches = [ + (fetchpatch { + name = "allow-guile-3.patch"; + url = "https://git.savannah.gnu.org/cgit/denemo.git/patch/?id=9de1c65e56a021925af532bb55336b0ce86d3084"; + postFetch = '' + substituteInPlace $out \ + --replace "2.6.8" "2.6.0" \ + --replace "2.6.9" "2.6.0" + ''; + hash = "sha256-Jj33k/KgvZgKG43MuLgjb4A2KNkm/z9ytzGKcXMAOI4="; + }) + ]; + buildInputs = [ - libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile + libjack2 guile lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi ]; @@ -25,6 +39,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + autoreconfHook + gtk-doc wrapGAppsHook intltool gettext diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index c85f956e1a8b..5fa5e75a637d 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; |