aboutsummaryrefslogtreecommitdiff
path: root/pkgs/misc/solfege
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-03-27 00:05:33 +0000
committerOrivej Desh <orivej@gmx.fr>2020-03-27 00:06:41 +0000
commitdd166f4cb4bbc1e33622aa87c8adf2c4eda7c174 (patch)
tree171021096bc408b1e962a2de22c7bbaf96835cd7 /pkgs/misc/solfege
parentc20428ee247c0b556b49daccebb44f6a2a9e4d1d (diff)
solfege: fix run
It was failing with: Traceback (most recent call last): File "/nix/store/…-solfege-3.22.2/bin/.solfege-wrapped", line 55, in <module> from solfege import presetup File "/nix/store/…-solfege-3.22.2/share/solfege/solfege/presetup.py", line 22, in <module> import gtk ImportError: No module named gtk
Diffstat (limited to 'pkgs/misc/solfege')
-rw-r--r--pkgs/misc/solfege/default.nix22
1 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 7ca9843e2e35..08397c8406f6 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,12 +1,10 @@
{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
, alsaUtils, vorbis-tools, csound, lilypond
-, makeWrapper
+, wrapGAppsHook
}:
-let
- inherit (pythonPackages) python pygtk;
-in stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
name = "solfege-3.22.2";
src = fetchurl {
@@ -14,10 +12,9 @@ in stdenv.mkDerivation rec {
sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ python pygtk gettext texinfo
- ghostscript librsvg gdk-pixbuf txt2man makeWrapper
- ];
+ nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ];
+ buildInputs = [ librsvg ];
+ propagatedBuildInputs = [ pythonPackages.pygtk ];
preBuild = ''
sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
@@ -29,12 +26,9 @@ in stdenv.mkDerivation rec {
default.config
'';
- postInstall = ''
- set -x
- wrapProgram "$out/bin/solfege" \
- --prefix PYTHONPATH ':' "$PYTHONPATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
- '';
+ format = "other";
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Ear training program";