Unverified Commit f965023d authored by Leix b's avatar Leix b Committed by GitHub
Browse files

mcaselector: add missing wrapGAppsHook (#280536) 



* mcaselector: add wrapGAppsHook

* mcaselector: don't wrap executable twice

* mcaselector: correctly escape bash variable

---------

Co-authored-by: default avatarAleksana <alexander.huang.y@gmail.com>
parent 8e141b8d

pkgs/tools/games/minecraft/mcaselector/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -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

  '';