diff options
author | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
commit | 16d7f7edae6847e7a792d79b533b245f71907f46 (patch) | |
tree | a304b937bc072e96e2745ede17c7e6b9b4495bee /pkgs/misc/solfege/default.nix | |
parent | eae4f22176789ce3b6a66bad773a45b12e895cdf (diff) | |
parent | 5de1e307f29ab91baeb43ab2a58ed13a944e40ea (diff) | |
download | nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.gz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.bz2 nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.lz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.xz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.zst nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/misc/solfege/default.nix')
-rw-r--r-- | pkgs/misc/solfege/default.nix | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index aea4da3eaeb8..05e13f3c9aae 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo -, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123 -, alsaUtils, vorbis-tools, csound, lilypond -, wrapGAppsHook +{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook +, buildPythonApplication, pycairo, pygobject3 +, gobject-introspection, gtk3, librsvg +, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond }: -pythonPackages.buildPythonApplication rec { - name = "solfege-3.22.2"; +buildPythonApplication rec { + name = "solfege-3.23.4"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; + sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; }; - nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ]; - buildInputs = [ librsvg ]; - propagatedBuildInputs = [ pythonPackages.pygtk ]; + patches = [ + ./css.patch + ./menubar.patch + ./webbrowser.patch + ]; + + nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; + buildInputs = [ gobject-introspection gtk3 librsvg ]; + propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ @@ -30,11 +36,11 @@ pythonPackages.buildPythonApplication rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ear training program"; homepage = "http://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor orivej ]; }; } |