From 35681340d18d3f3dd4d399adc1369f8a0eb004c3 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:27:48 +0100 Subject: [PATCH 1/3] Revert "love: 0.10.2 -> 11.4" There are supposed to be different versions of love. - 0.10.2 in 0.10.nix - 11.4 in 11.nix This reverts commit e8662b6688ff790102b01c3c6c176e98fb1dca88. --- pkgs/development/interpreters/love/0.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 5e97e4f003e2..881bc59ccff2 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "11.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; + sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; nativeBuildInputs = [ pkg-config autoconf automake ]; From fe18efc37b8c7b8d362c23bb559f9bd4cbb1fc1d Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:38:49 +0100 Subject: [PATCH 2/3] mrrescue: fix path to love game file --- pkgs/games/mrrescue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index a873424aa24c..a020a6b34f1b 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v $src $out/share/${pname}.love + cp -v $src $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love From 5dc4dfb42222b1db97f1b105e4c8b30217e2c762 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:55:00 +0100 Subject: [PATCH 3/3] love: make love_11 the default Use the latest love version by default, but hardcode the 0.10.2 legacy version for games that are not yet compatible with love 11. The following packages depend on love. They all seem to work. love 0.10.2 users: duckmarines, mrrescue, 90secondportraits, orthorobot love 11.4 users: sienna, mari0 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb6fd2f0c4d6..8653d2ba8d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16403,7 +16403,7 @@ with pkgs; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; love_11 = callPackage ../development/interpreters/love/11.nix { }; - love = love_0_10; + love = love_11; wabt = callPackage ../development/tools/wabt { }; @@ -35388,7 +35388,7 @@ with pkgs; python = python3; }; - mrrescue = callPackage ../games/mrrescue { }; + mrrescue = callPackage ../games/mrrescue { love = love_0_10; }; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; @@ -35499,7 +35499,7 @@ with pkgs; openxray = callPackage ../games/openxray { }; - orthorobot = callPackage ../games/orthorobot { }; + orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; pacvim = callPackage ../games/pacvim { };