From 810fcd88f8c03a91384c72e562cbc1353e2daf7b Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Tue, 19 Nov 2024 18:44:35 +0800 Subject: [PATCH 1/4] tuxguitar: fix start script --- pkgs/by-name/tu/tuxguitar/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index e8df3929fc6f0..bbea8d4dea703 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -10,6 +10,8 @@ fluidsynth, libpulseaudio, lilv, + which, + wrapGAppsHook, nixosTests, }: @@ -22,8 +24,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; }; + buildInputs = [ + which + ]; + nativeBuildInputs = [ makeWrapper + wrapGAppsHook ]; installPhase = '' @@ -36,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share $out/bin/share wrapProgram $out/bin/tuxguitar \ - --set JAVA "${jre}/bin/java" \ + --set PATH "$PATH:${jre}/bin" \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 739e9ee35f978ec58de9258fb408be52b7ec4d22 Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Tue, 19 Nov 2024 23:02:31 +0800 Subject: [PATCH 2/4] tuxguitar: apply suggestions --- pkgs/by-name/tu/tuxguitar/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index bbea8d4dea703..2a6fe2d955ccb 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -11,7 +11,7 @@ libpulseaudio, lilv, which, - wrapGAppsHook, + wrapGAppsHook3, nixosTests, }: @@ -24,15 +24,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; }; - buildInputs = [ - which - ]; - nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; + dontWrapGApps = true; + installPhase = '' mkdir -p $out/bin cp -r dist lib share $out/ @@ -41,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/dist $out/bin/dist ln -s $out/lib $out/bin/lib ln -s $out/share $out/bin/share + ''; + postFixup = '' wrapProgram $out/bin/tuxguitar \ - --set PATH "$PATH:${jre}/bin" \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath[ jre which ]} \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 9660fc3945d178b435a45d5efbd69e0b93df5794 Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Wed, 20 Nov 2024 01:12:15 +0800 Subject: [PATCH 3/4] tuxguitar: format Co-authored-by: seth --- pkgs/by-name/tu/tuxguitar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index 2a6fe2d955ccb..abbc7dfd9662c 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/tuxguitar \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath[ jre which ]} \ + --prefix PATH : ${lib.makeBinPath [ jre which ]} \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 63b1496a2ce377644f1efbf2e462790d93bb225f Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Wed, 20 Nov 2024 02:51:58 +0800 Subject: [PATCH 4/4] tuxguitar: nixfmt --- pkgs/by-name/tu/tuxguitar/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index abbc7dfd9662c..a393c1a85d7ce 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -44,7 +44,12 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/tuxguitar \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ jre which ]} \ + --prefix PATH : ${ + lib.makeBinPath [ + jre + which + ] + } \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt