From c3f5f7c572c9e1a46b16a9773b25e276d36c4e6e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 18:40:39 +0200 Subject: [PATCH 1/6] orthorobot: move to by-name Signed-off-by: Marcin Serwin --- .../default.nix => by-name/or/orthorobot/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/orthorobot/default.nix => by-name/or/orthorobot/package.nix} (100%) diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/by-name/or/orthorobot/package.nix similarity index 100% rename from pkgs/games/orthorobot/default.nix rename to pkgs/by-name/or/orthorobot/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 281d3c80ad07..342be354c3cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13774,8 +13774,6 @@ with pkgs; stdenv = gccStdenv; }; - orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; - papermcServers = callPackages ../games/papermc { }; papermc = papermcServers.papermc; From 73034a5f68030843b38a4de2a4985601b440b8f7 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 22:56:01 +0200 Subject: [PATCH 2/6] orthorobot: use finalAttrs Signed-off-by: Marcin Serwin --- pkgs/by-name/or/orthorobot/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/or/orthorobot/package.nix b/pkgs/by-name/or/orthorobot/package.nix index b53889159959..06ed6085204a 100644 --- a/pkgs/by-name/or/orthorobot/package.nix +++ b/pkgs/by-name/or/orthorobot/package.nix @@ -12,22 +12,23 @@ zip, }: -stdenv.mkDerivation rec { +let + icon = fetchurl { + url = "https://stabyourself.net/images/screenshots/orthorobot-5.png"; + sha256 = "13fa4divdqz4vpdij1lcs5kf6w2c4jm3cc9q6bz5h7lkng31jzi6"; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "orthorobot"; version = "1.1.1"; src = fetchFromGitHub { owner = "Stabyourself"; repo = "orthorobot"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p"; }; - icon = fetchurl { - url = "https://stabyourself.net/images/screenshots/orthorobot-5.png"; - sha256 = "13fa4divdqz4vpdij1lcs5kf6w2c4jm3cc9q6bz5h7lkng31jzi6"; - }; - desktopItems = [ (makeDesktopItem { name = "orthorobot"; @@ -75,4 +76,4 @@ stdenv.mkDerivation rec { license = licenses.free; downloadPage = "https://stabyourself.net/orthorobot/"; }; -} +}) From 3345aed305568c7ea51ae87b254be116bf22ab84 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 23:03:27 +0200 Subject: [PATCH 3/6] orthorobot: remove `with lib;` from meta Signed-off-by: Marcin Serwin --- pkgs/by-name/or/orthorobot/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/or/orthorobot/package.nix b/pkgs/by-name/or/orthorobot/package.nix index 06ed6085204a..f9a9cb3287c5 100644 --- a/pkgs/by-name/or/orthorobot/package.nix +++ b/pkgs/by-name/or/orthorobot/package.nix @@ -68,12 +68,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Recharge the robot"; mainProgram = "orthorobot"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = licenses.free; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; downloadPage = "https://stabyourself.net/orthorobot/"; }; }) From 32f21bc9f2b2cb7f56a658ea0cbfaef3e912547d Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 23:06:11 +0200 Subject: [PATCH 4/6] orthorobot: split out build phase commands Signed-off-by: Marcin Serwin --- pkgs/by-name/or/orthorobot/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orthorobot/package.nix b/pkgs/by-name/or/orthorobot/package.nix index f9a9cb3287c5..39fe0f7f0113 100644 --- a/pkgs/by-name/or/orthorobot/package.nix +++ b/pkgs/by-name/or/orthorobot/package.nix @@ -58,10 +58,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - installPhase = '' - runHook preInstall + buildPhase = '' + runHook preBuild zip -9 -r orthorobot.love ./* strip-nondeterminism --type zip orthorobot.love + runHook postBuild + ''; + + installPhase = '' + runHook preInstall install -Dm444 -t $out/share/games/lovegames/ orthorobot.love makeWrapper ${love}/bin/love $out/bin/orthorobot \ --add-flags $out/share/games/lovegames/orthorobot.love From c3c32b2932f0f8133e4d2768e9f86055bc452124 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 23:10:14 +0200 Subject: [PATCH 5/6] orthorobot: make the desktop entry more detailed Signed-off-by: Marcin Serwin --- pkgs/by-name/or/orthorobot/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orthorobot/package.nix b/pkgs/by-name/or/orthorobot/package.nix index 39fe0f7f0113..f0ebe6b1463c 100644 --- a/pkgs/by-name/or/orthorobot/package.nix +++ b/pkgs/by-name/or/orthorobot/package.nix @@ -34,10 +34,14 @@ stdenv.mkDerivation (finalAttrs: { name = "orthorobot"; exec = "orthorobot"; icon = icon; - comment = "Robot game"; + comment = "A perspective based puzzle game, where you flatten the view to move across gaps"; desktopName = "Orthorobot"; - genericName = "orthorobot"; - categories = [ "Game" ]; + genericName = "Perspective puzzle game"; + categories = [ + "Game" + "LogicGame" + ]; + singleMainWindow = true; }) ]; From 8a05f47ac3c83ba8063a5c548b8069df9d66fb48 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 29 Sep 2025 23:11:36 +0200 Subject: [PATCH 6/6] orthorobot: specify license more accurately Signed-off-by: Marcin Serwin --- pkgs/by-name/or/orthorobot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/or/orthorobot/package.nix b/pkgs/by-name/or/orthorobot/package.nix index f0ebe6b1463c..b2cb33ddff43 100644 --- a/pkgs/by-name/or/orthorobot/package.nix +++ b/pkgs/by-name/or/orthorobot/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "orthorobot"; maintainers = with lib.maintainers; [ leenaars ]; platforms = lib.platforms.linux; - license = lib.licenses.free; + license = lib.licenses.wtfpl; downloadPage = "https://stabyourself.net/orthorobot/"; }; })