From 8a8f1d4e8be8331ecb691ab936584fe1d716b9a8 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Sat, 16 Dec 2023 16:05:20 +0530 Subject: [PATCH 1/4] atlauncher: 3.4.35.3 -> 3.4.35.4 --- pkgs/games/atlauncher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index 77fcdaaf8721..37e2ecc44115 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.35.3"; + version = "3.4.35.4"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-2080rVGBBM3YZmmBVBfMhnCErLzxuRDDi4zmCniJYFY="; + hash = "sha256-M8ygN70yizJM6VEffBh/lH/DneKAzQ5UFzc3g51dja0="; }; env.ICON = fetchurl { From 3a3ca849c893f7f6a831511cb020ec0d038fdfc8 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Sat, 16 Dec 2023 16:14:46 +0530 Subject: [PATCH 2/4] atlauncher: move package into by-name --- .../default.nix => by-name/at/atlauncher/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/atlauncher/default.nix => by-name/at/atlauncher/package.nix} (100%) diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/by-name/at/atlauncher/package.nix similarity index 100% rename from pkgs/games/atlauncher/default.nix rename to pkgs/by-name/at/atlauncher/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a53cacef4ee..c1a0cfb4e0ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37324,8 +37324,6 @@ with pkgs; antsimulator = callPackage ../games/antsimulator { }; - atlauncher = callPackage ../games/atlauncher { }; - augustus = callPackage ../games/augustus { }; ballerburg = callPackage ../games/ballerburg { } ; From 984f5cb71dc4285531452a32162677f83cec2a4b Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Thu, 4 Jan 2024 00:03:54 +0530 Subject: [PATCH 3/4] atlauncher: add meta.sourceProvenance --- pkgs/by-name/at/atlauncher/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 37e2ecc44115..f3f0aaa8a33d 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ maintainers.getpsyched ]; platforms = platforms.all; mainProgram = "atlauncher"; + sourceProvenance = [ sourceTypes.binaryBytecode ]; }; }) From eb97e9f924943c968545b64e3df77a73fc62b917 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Thu, 4 Jan 2024 00:06:58 +0530 Subject: [PATCH 4/4] atlauncher: make binary name static Align this name with meta.mainProgram as that points to the main binary of a package. Overriding the pname should not break this. --- pkgs/by-name/at/atlauncher/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index f3f0aaa8a33d..c9c4308f4f8e 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/share/java cp $src $out/share/java/ATLauncher.jar - makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \ + makeWrapper ${jre}/bin/java $out/bin/atlauncher \ --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\"" \