@@ -1,12 +1,10 @@
11{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
22, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
33, alsaUtils, vorbis-tools, csound, lilypond
4−, makeWrapper
4+, wrapGAppsHook
55}:
66
7−let
8− inherit (pythonPackages) python pygtk;
9−in stdenv.mkDerivation rec {
7+pythonPackages.buildPythonApplication rec {
108 name = "solfege-3.22.2";
119
1210 src = fetchurl {
@@ -14,10 +12,9 @@ in stdenv.mkDerivation rec {
1412 sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
1513 };
1614
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ python pygtk gettext texinfo
19− ghostscript librsvg gdk-pixbuf txt2man makeWrapper
20− ];
15+ nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ];
16+ buildInputs = [ librsvg ];
17+ propagatedBuildInputs = [ pythonPackages.pygtk ];
2118
2219 preBuild = ''
2320 sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
@@ -29,12 +26,9 @@ in stdenv.mkDerivation rec {
2926 default.config
3027 '';
3128
32− postInstall = ''
33− set -x
34− wrapProgram "$out/bin/solfege" \
35− --prefix PYTHONPATH ':' "$PYTHONPATH" \
36− --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
37− '';
29+ format = "other";
30+
31+ enableParallelBuilding = true;
3832
3933 meta = with stdenv.lib; {
4034 description = "Ear training program";