diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-28 22:17:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-28 22:17:49 +0200 |
commit | ca0067fa802011d12e488a84b86263d606dc05b8 (patch) | |
tree | 84152c1cd8f4b82b9bac47a420252fd828b3839d /pkgs/games | |
parent | 49e63bb9567bf046e3b918ba53d5b1b559f8e866 (diff) | |
parent | dd414eadf576a0b64897ef0b18b606f8fedfa8df (diff) | |
download | nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar.gz nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar.bz2 nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar.lz nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar.xz nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.tar.zst nixlib-ca0067fa802011d12e488a84b86263d606dc05b8.zip |
Merge pull request #257299 from GetPsyched/atlauncher
atlauncher: 3.4.30.0 -> 3.4.34.0
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/atlauncher/default.nix | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index 4f45477ecec9..5e94a821c02d 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -1,12 +1,17 @@ -{ 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"; - version = "3.4.30.0"; + version = "3.4.34.0"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-eSb+qH/ZoPpeOyIuoJsEpecG7uUyh0vkqZzNuxriRuI="; + hash = "sha256-gHUYZaxADchikoCmAfqFjVbMYhhiwg2BZKctmww1Mlw="; + }; + + env.ICON = fetchurl { + url = "https://atlauncher.com/assets/images/logo.svg"; + hash = "sha256-XoqpsgLmkpa2SdjZvPkgg6BUJulIBIeu6mBsJJCixfo="; }; dontUnpack = true; @@ -14,33 +19,29 @@ 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} \\"'' - } - runHook postInstall - ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/java + cp $src $out/share/java/ATLauncher.jar + + 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"; - icon = fetchurl { - url = "https://avatars.githubusercontent.com/u/7068667"; - hash = "sha256-YmEkxf4rZxN3jhiib0UtdUDDcn9lw7IMbiEucBL7b9o="; - }; + exec = finalAttrs.pname; + icon = finalAttrs.pname; desktopName = "ATLauncher"; categories = [ "Game" ]; }) |