From 0a38c9f514973a7b51ee82669e314702f32de20e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 18:59:27 +0200 Subject: [PATCH 1/3] _90secondportraits: build from source Signed-off-by: Marcin Serwin --- pkgs/games/90secondportraits/default.nix | 27 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 3d0f95f304a8..96d12f818f31 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -1,11 +1,14 @@ { lib, stdenv, + fetchFromGitHub, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems, + strip-nondeterminism, + zip, }: let @@ -33,23 +36,33 @@ stdenv.mkDerivation rec { inherit pname desktopItems; version = "1.01b"; - src = fetchurl { - url = "https://github.com/SimonLarsen/90-Second-Portraits/releases/download/${version}/${pname}-${version}.love"; - sha256 = "0jj3k953r6vb02212gqcgqpb4ima87gnqgls43jmylxq2mcm33h5"; + src = fetchFromGitHub { + owner = "SimonLarsen"; + repo = "90-Second-Portraits"; + tag = version; + hash = "sha256-xxgB8Aw7QTK9lPus7Q4E7iP2/rRfCwwiYbk5NqzujHI="; + fetchSubmodules = true; }; nativeBuildInputs = [ makeWrapper copyDesktopItems + strip-nondeterminism + zip ]; - dontUnpack = true; + buildPhase = '' + runHook preBuild + zip -9 -r 90secondportraits.love ./* + strip-nondeterminism --type zip 90secondportraits.love + runHook postBuild + ''; installPhase = '' runHook preInstall - install -Dm444 $src $out/share/games/lovegames/${pname}.love - makeWrapper ${love}/bin/love $out/bin/${pname} \ - --add-flags $out/share/games/lovegames/${pname}.love + install -Dm444 90secondportraits.love $out/share/games/lovegames/90secondportraits.love + makeWrapper ${love}/bin/love $out/bin/90secondportraits \ + --add-flags $out/share/games/lovegames/90secondportraits.love runHook postInstall ''; From 09274eb9dff83d87eaf4fb68237ea980565d44b6 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 19:23:50 +0200 Subject: [PATCH 2/3] _90secondportraits: add patch for Love 11 support Signed-off-by: Marcin Serwin --- pkgs/games/90secondportraits/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 96d12f818f31..9226da55f699 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchurl, + fetchpatch2, love, makeWrapper, makeDesktopItem, @@ -44,6 +45,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + # Love 11 support + url = "https://github.com/SimonLarsen/90-Second-Portraits/commit/0ae7ba046f14cef9857fd6c05d9072455097441f.patch?full_index=true"; + hash = "sha256-/C4gqzwHQqZCuTA/m6WX8mvTxmLxOcHRItVLA3bty3Y="; + }) + ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e39009dfeb3a..e1d8483a4f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13461,7 +13461,7 @@ with pkgs; ### GAMES - _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; + _90secondportraits = callPackage ../games/90secondportraits { }; inherit (callPackages ../games/fteqw { }) fteqw From 4bd61445beadeeed594107c73c3830ef604e340b Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 1 Oct 2025 19:27:28 +0200 Subject: [PATCH 3/3] _90secondportraits: move to by-name Signed-off-by: Marcin Serwin --- .../default.nix => by-name/_9/_90secondportraits/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/90secondportraits/default.nix => by-name/_9/_90secondportraits/package.nix} (100%) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/by-name/_9/_90secondportraits/package.nix similarity index 100% rename from pkgs/games/90secondportraits/default.nix rename to pkgs/by-name/_9/_90secondportraits/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1d8483a4f92..02f066cad990 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13461,8 +13461,6 @@ with pkgs; ### GAMES - _90secondportraits = callPackage ../games/90secondportraits { }; - inherit (callPackages ../games/fteqw { }) fteqw fteqw-dedicated