about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-04-25 10:07:40 -0300
committerGitHub <noreply@github.com>2024-04-25 10:07:40 -0300
commit0fee35788850de4a66fb218b7e20c21f0f54e0ac (patch)
treeb9faae57f6fab5ab4b26176b2e39ac8fb2caa00c /pkgs
parentfb65d015bf787d7ff38213f7509dc76ec9062e70 (diff)
mcaselector: add missing wrapGAppsHook (#306545) [Backport release-23.11]
* mcaselector: add wrapGAppsHook

(cherry picked from commit 7dfacd893582e4eff8fe00461a25b2c5996d7e71)

* mcaselector: don't wrap executable twice

(cherry picked from commit 4bcdfaccf4c1bbd0a0fdb6f89ce80e596ea3e22b)

* mcaselector: correctly escape bash variable

(cherry picked from commit 0cf87e49b4a2b0af644b9e958c746383d4b041a3)

---------

Co-authored-by: LeixB <abone9999@gmail.com>
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/games/minecraft/mcaselector/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix
index 0cf48dbe0b6b3..8a23763e3acbc 100644
--- a/pkgs/tools/games/minecraft/mcaselector/default.nix
+++ b/pkgs/tools/games/minecraft/mcaselector/default.nix
@@ -2,6 +2,7 @@
 , stdenvNoCC
 , fetchurl
 , makeWrapper
+, wrapGAppsHook
 , jre
 }:
 
@@ -17,7 +18,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontUnpack = true;
   dontBuild = true;
 
-  nativeBuildInputs = [ jre makeWrapper ];
+  nativeBuildInputs = [ jre makeWrapper wrapGAppsHook ];
+
+  dontWrapGApps = true;
 
   installPhase = ''
     runHook preInstall
@@ -25,7 +28,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mkdir -p $out/{bin,lib/mcaselector}
     cp $src $out/lib/mcaselector/mcaselector.jar
     makeWrapper ${jre}/bin/java $out/bin/mcaselector \
-      --add-flags "-jar $out/lib/mcaselector/mcaselector.jar"
+      --add-flags "-jar $out/lib/mcaselector/mcaselector.jar" \
+      ''${gappsWrapperArgs[@]}
 
     runHook postInstall
   '';