From 3a6dd066889eddc55ca300a8883962da88d86240 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 1 Aug 2022 09:35:18 +1200
Subject: minetest: 5.5.0 -> 5.5.1

---
 pkgs/games/minetest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 2a1039901f38d..ae2a1e822e11e 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -91,9 +91,9 @@ let
   };
 
   v5 = {
-    version = "5.5.0";
-    sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA=";
-    dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0=";
+    version = "5.5.1";
+    sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA=";
+    dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k=";
   };
 
 in {
-- 
cgit 1.4.1


From 53b1553a3f2201f1da489adc010e10d9ad84d039 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 1 Aug 2022 09:52:47 +1200
Subject: minetest: Patch executable paths

---
 pkgs/games/minetest/default.nix | 51 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 5 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index ae2a1e822e11e..ed6b2deda5098 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,8 +1,44 @@
-{ lib, stdenv, fetchFromGitHub, cmake, irrlichtmt, libpng, bzip2, curl, libogg, jsoncpp
-, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit
-, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex
-, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp
-, OpenGL, OpenAL ? openal, Carbon, Cocoa, withTouchSupport ? false
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, irrlichtmt
+, coreutils
+, libpng
+, bzip2
+, curl
+, libogg
+, jsoncpp
+, libjpeg
+, libXxf86vm
+, libGLU
+, libGL
+, openal
+, libvorbis
+, sqlite
+, luajit
+, freetype
+, gettext
+, doxygen
+, ncurses
+, graphviz
+, xorg
+, gmp
+, libspatialindex
+, leveldb
+, postgresql
+, hiredis
+, libiconv
+, zlib
+, libXrandr
+, libX11
+, ninja
+, prometheus-cpp
+, OpenGL
+, OpenAL ? openal
+, Carbon
+, Cocoa
+, withTouchSupport ? false
 }:
 
 with lib;
@@ -72,9 +108,14 @@ let
       leveldb postgresql hiredis prometheus-cpp
     ];
 
+    postPatch = ''
+      substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm"
+    '';
+
     postInstall = ''
       mkdir -pv $out/share/minetest/games/minetest_game/
       cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
+      patchShebangs $out
     '';
 
     meta = with lib; {
-- 
cgit 1.4.1


From dc835258f8ea3bff5166a05705a0bb419ba355fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Aug 2022 10:06:42 +0000
Subject: quakespasm: 0.94.3 -> 0.94.7

---
 pkgs/games/quakespasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index faeea7e4765be..d130df696b45d 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "quakespasm";
-  version = "0.94.3";
+  version = "0.94.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
-    sha256 = "sha256-PpX20+XHIF4aRosErKGnylXIqdMtG3Ubsi70zNG9Dq0=";
+    sha256 = "sha256-xkXG+PBCCM+vzSZESgP2kOsD0rSg6pRupJdH5Y+fc/4=";
   };
 
   sourceRoot = "${pname}-${version}/Quake";
-- 
cgit 1.4.1


From ce162ecf4bee6a7fe83f698197d53924d3d94f71 Mon Sep 17 00:00:00 2001
From: edef <edef>
Date: Mon, 1 Aug 2022 16:55:29 +0000
Subject: polymc: use LD_LIBRARY_PATH, not GAME_LIBRARY_PATH

Since 1.4.0, PolyMC simply uses LD_LIBRARY_PATH, rather than a custom
GAME_LIBRARY_PATH variable.

This change was made in PolyMC/PolyMC#893, which also fixes the in-tree
Nix wrapper script to match. NixOS/nixpkgs#182621 updated our PolyMC to
1.4.0, but did not port the wrapper changes along.

The lack of LD_LIBRARY_PATH causes libpulse to be unavailable,
causing the sound issues observed in NixOS/nixpkgs#184189.

Change-Id: I4042f774c1fc804609dbaa3f4206ca0dd8ab20b3
---
 pkgs/games/polymc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix
index 134e54c0939b6..e2ceec0e970be 100644
--- a/pkgs/games/polymc/default.nix
+++ b/pkgs/games/polymc/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   in ''
     # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
     wrapQtApp $out/bin/polymc \
-      --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
+      --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
       --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
       --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
   '';
-- 
cgit 1.4.1