From c19ad0abc01013cc080880b17de1b526e65d18b7 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 20:12:39 +0200 Subject: [PATCH 1/4] mrrescue: build from source Signed-off-by: Marcin Serwin --- pkgs/games/mrrescue/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index c42364f0d71d..77212984874b 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -1,11 +1,14 @@ { lib, stdenv, + fetchFromGitHub, fetchurl, love, lua, makeWrapper, makeDesktopItem, + strip-nondeterminism, + zip, }: let @@ -32,24 +35,33 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love"; - sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi"; + src = fetchFromGitHub { + owner = "SimonLarsen"; + repo = "mrrescue"; + tag = "v${version}"; + hash = "sha256-/g4SzaI1tSJZg1wW0onQwLMMam5v8PvM45tqP2FxZCA="; }; nativeBuildInputs = [ lua love makeWrapper + strip-nondeterminism + zip ]; - dontUnpack = true; + buildPhase = '' + runHook preBuild + zip -9 -r mrrescue.love ./* + strip-nondeterminism --type zip mrrescue.love + runHook postBuild + ''; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v $src $out/share/games/lovegames/${pname}.love + cp -v mrrescue.love $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love From 8209f9b9b4f76bcfcc2d7ab2b1d315da067a349c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 20:19:02 +0200 Subject: [PATCH 2/4] mrrescue: 1.02d -> 1.02d-unstable-2018-08-18 Signed-off-by: Marcin Serwin --- pkgs/games/mrrescue/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index 77212984874b..68669ec75c11 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -13,7 +13,7 @@ let pname = "mrrescue"; - version = "1.02d"; + version = "1.02d-unstable-2018-08-18"; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/mrrescue.png"; @@ -38,8 +38,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "SimonLarsen"; repo = "mrrescue"; - tag = "v${version}"; - hash = "sha256-/g4SzaI1tSJZg1wW0onQwLMMam5v8PvM45tqP2FxZCA="; + rev = "a5be73c60acb8d1be506f7b5e48e784492ba96ce"; + hash = "sha256-UDfMgE7LyyXioURclA56Kx+bTrwMNDPR3evCRJ3reRM="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e39009dfeb3a..84944d268c0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13729,7 +13729,7 @@ with pkgs; luanti-client = luanti.override { buildServer = false; }; luanti-server = luanti.override { buildClient = false; }; - mrrescue = callPackage ../games/mrrescue { love = love_0_10; }; + mrrescue = callPackage ../games/mrrescue { }; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; From 959299e148b1dfb78b4f50758e9be22864aa0e68 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 20:19:58 +0200 Subject: [PATCH 3/4] mrrescue: move to by-name Signed-off-by: Marcin Serwin --- .../mrrescue/default.nix => by-name/mr/mrrescue/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/mrrescue/default.nix => by-name/mr/mrrescue/package.nix} (100%) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/by-name/mr/mrrescue/package.nix similarity index 100% rename from pkgs/games/mrrescue/default.nix rename to pkgs/by-name/mr/mrrescue/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84944d268c0d..591a06ad692e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13729,8 +13729,6 @@ with pkgs; luanti-client = luanti.override { buildServer = false; }; luanti-server = luanti.override { buildClient = false; }; - mrrescue = callPackage ../games/mrrescue { }; - mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; }; From c1fd305f935475e106783f2b05def823257bdf01 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 20:21:32 +0200 Subject: [PATCH 4/4] mrrescue: inline pname and version Signed-off-by: Marcin Serwin --- pkgs/by-name/mr/mrrescue/package.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mr/mrrescue/package.nix b/pkgs/by-name/mr/mrrescue/package.nix index 68669ec75c11..48052f53b47b 100644 --- a/pkgs/by-name/mr/mrrescue/package.nix +++ b/pkgs/by-name/mr/mrrescue/package.nix @@ -12,9 +12,6 @@ }: let - pname = "mrrescue"; - version = "1.02d-unstable-2018-08-18"; - icon = fetchurl { url = "http://tangramgames.dk/img/thumb/mrrescue.png"; sha256 = "1y5ahf0m01i1ch03axhvp2kqc6lc1yvh59zgvgxw4w7y3jryw20k"; @@ -22,7 +19,7 @@ let desktopItem = makeDesktopItem { name = "mrrescue"; - exec = pname; + exec = "mrrescue"; icon = icon; comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; @@ -33,7 +30,8 @@ let in stdenv.mkDerivation { - name = "${pname}-${version}"; + pname = "mrrescue"; + version = "1.02d-unstable-2018-08-18"; src = fetchFromGitHub { owner = "SimonLarsen"; @@ -61,11 +59,11 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v mrrescue.love $out/share/games/lovegames/${pname}.love + cp -v mrrescue.love $out/share/games/lovegames/mrrescue.love - makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + makeWrapper ${love}/bin/love $out/bin/mrrescue --add-flags $out/share/games/lovegames/mrrescue.love - chmod +x $out/bin/${pname} + chmod +x $out/bin/mrrescue mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ '';