tuxguitar: 125945 (#131028)

* tuxguitar: Ensure that tuxguitar is launched with java 8 comtabilbe jre and libraries as greate java version is not supported

* tuxguitar: Added test to verify application starts without problems

* tuxguitar: 1.5.2 -> 1.5.4

authored by

Benjamin Asbach and committed by
GitHub
9fd41a9a 10204ffe

+35 -7
+1
nixos/tests/all-tests.nix
··· 440 txredisapi = handleTest ./txredisapi.nix {}; 441 tuptime = handleTest ./tuptime.nix {}; 442 turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; 443 ucarp = handleTest ./ucarp.nix {}; 444 ucg = handleTest ./ucg.nix {}; 445 udisks2 = handleTest ./udisks2.nix {};
··· 440 txredisapi = handleTest ./txredisapi.nix {}; 441 tuptime = handleTest ./tuptime.nix {}; 442 turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; 443 + tuxguitar = handleTest ./tuxguitar.nix {}; 444 ucarp = handleTest ./ucarp.nix {}; 445 ucg = handleTest ./ucg.nix {}; 446 udisks2 = handleTest ./udisks2.nix {};
+24
nixos/tests/tuxguitar.nix
···
··· 1 + import ./make-test-python.nix ({ pkgs, ... }: { 2 + name = "tuxguitar"; 3 + meta = with pkgs.lib.maintainers; { 4 + maintainers = [ asbachb ]; 5 + }; 6 + 7 + machine = { config, pkgs, ... }: { 8 + imports = [ 9 + ./common/x11.nix 10 + ]; 11 + 12 + services.xserver.enable = true; 13 + 14 + environment.systemPackages = [ pkgs.tuxguitar ]; 15 + }; 16 + 17 + testScript = '' 18 + machine.wait_for_x() 19 + machine.succeed("tuxguitar &") 20 + machine.wait_for_window("TuxGuitar - Untitled.tg") 21 + machine.sleep(1) 22 + machine.screenshot("tuxguitar") 23 + ''; 24 + })
+6 -6
pkgs/applications/editors/music/tuxguitar/default.nix
··· 1 - { lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: 2 3 let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; 4 if stdenv.hostPlatform.system == "i686-linux" then 5 - { arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; } 6 else 7 - { arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; }; 8 in stdenv.mkDerivation rec { 9 - version = "1.5.2"; 10 pname = "tuxguitar"; 11 12 src = fetchurl { 13 - url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz"; 14 sha256 = metadata.sha256; 15 }; 16 ··· 26 ln -s $out/share $out/bin/share 27 28 wrapProgram $out/bin/tuxguitar \ 29 - --set JAVA "${jdk}/bin/java" \ 30 --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ 31 --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" 32 '';
··· 1 + { lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: 2 3 let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; 4 if stdenv.hostPlatform.system == "i686-linux" then 5 + { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } 6 else 7 + { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; 8 in stdenv.mkDerivation rec { 9 + version = "1.5.4"; 10 pname = "tuxguitar"; 11 12 src = fetchurl { 13 + url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz"; 14 sha256 = metadata.sha256; 15 }; 16 ··· 26 ln -s $out/share $out/bin/share 27 28 wrapProgram $out/bin/tuxguitar \ 29 + --set JAVA "${jre}/bin/java" \ 30 --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ 31 --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" 32 '';
+4 -1
pkgs/top-level/all-packages.nix
··· 27530 27531 tut = callPackage ../applications/misc/tut { }; 27532 27533 - tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; 27534 27535 twister = callPackage ../applications/networking/p2p/twister { }; 27536
··· 27530 27531 tut = callPackage ../applications/misc/tut { }; 27532 27533 + tuxguitar = callPackage ../applications/editors/music/tuxguitar { 27534 + jre = jre8; 27535 + swt = swt_jdk8; 27536 + }; 27537 27538 twister = callPackage ../applications/networking/p2p/twister { }; 27539