From dd414eadf576a0b64897ef0b18b606f8fedfa8df Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Wed, 27 Sep 2023 15:53:54 +0530 Subject: [PATCH] atlauncher: refactor install phase - move working dir from `.atlauncher` to `.local/share/ATLauncher` - remove steam-run as a dependency - fix no-launcher-update not working when launching from CLI --- pkgs/games/atlauncher/default.nix | 39 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index 439b7aaa6b25..5e94a821c02d 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -1,4 +1,4 @@ -{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, steam-run, withSteamRun ? true, writeShellScript }: +{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, udev, xorg }: stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; @@ -19,33 +19,28 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ]; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - installPhase = - let - # hack to use steam-run along with the exec - steamrun = writeShellScript "steamrun" '' - shift - exec ${steam-run}/bin/steam-run "''$@" - ''; - in - '' - runHook preInstall - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ - --add-flags "-jar $src --working-dir=\$HOME/.atlauncher" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ${ - lib.strings.optionalString withSteamRun ''--run "${steamrun} \\"'' - } + installPhase = '' + runHook preInstall - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $ICON $out/share/icons/hicolor/scalable/apps/${finalAttrs.pname}.svg + mkdir -p $out/bin $out/share/java + cp $src $out/share/java/ATLauncher.jar - runHook postInstall - ''; + makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm udev ]}" \ + --add-flags "-jar $out/share/java/ATLauncher.jar" \ + --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ + --add-flags "--no-launcher-update" + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $ICON $out/share/icons/hicolor/scalable/apps/${finalAttrs.pname}.svg + + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { name = finalAttrs.pname; - exec = "${finalAttrs.pname} --no-launcher-update true"; + exec = finalAttrs.pname; icon = finalAttrs.pname; desktopName = "ATLauncher"; categories = [ "Game" ];