From ee32d5147c3d273f930dfae523bdfc696ddf1090 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 27 Oct 2019 13:03:55 +0100 Subject: [PATCH] tuxguitar: 1.2 -> 1.5.2 --- .../editors/music/tuxguitar/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 70f99fa749b..8522ecf9c78 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }: +{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } + { arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; } else - { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; + { arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; }; in stdenv.mkDerivation rec { - version = "1.2"; + version = "1.5.2"; pname = "tuxguitar"; src = fetchurl { @@ -18,15 +18,16 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r lib share $out/ - cp tuxguitar $out/bin/tuxguitar - cp tuxguitar.jar $out/lib + cp -r dist lib share $out/ + cp tuxguitar.sh $out/bin/tuxguitar + ln -s $out/dist $out/bin/dist + ln -s $out/lib $out/bin/lib ln -s $out/share $out/bin/share wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" '';