From c575b378c9ee0ae360a885633e84b4565add5b6e Mon Sep 17 00:00:00 2001
From: fly <merspieler@airmail.cc>
Date: Mon, 17 Jul 2023 23:49:51 +0200
Subject: [PATCH 1/2] maintainers: add merspieler

Signed-off-by: fly <merspieler@airmail.cc>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4f5e7132ce443..1d60f139166f4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10651,6 +10651,12 @@
     github = "Mephistophiles";
     githubId = 4850908;
   };
+  merspieler = {
+    email = "merspieler@airmail.cc";
+    name = "merspieler";
+    github = "merspieler";
+    githubId = 29063255;
+  };
   mfossen = {
     email = "msfossen@gmail.com";
     github = "mfossen";

From d15df7a01f385a05d87bc8855ed14e09e33028c3 Mon Sep 17 00:00:00 2001
From: fly <merspieler@alwaysdata.com>
Date: Fri, 6 Oct 2023 15:06:57 +0200
Subject: [PATCH 2/2] 4d-minesweeper: init at 2.0

---
 pkgs/games/4d-minesweeper/default.nix | 108 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |   2 +
 2 files changed, 110 insertions(+)
 create mode 100644 pkgs/games/4d-minesweeper/default.nix

diff --git a/pkgs/games/4d-minesweeper/default.nix b/pkgs/games/4d-minesweeper/default.nix
new file mode 100644
index 0000000000000..cded6d34968da
--- /dev/null
+++ b/pkgs/games/4d-minesweeper/default.nix
@@ -0,0 +1,108 @@
+{ lib
+, copyDesktopItems
+, fetchFromGitHub
+, makeDesktopItem
+, stdenv
+, unzip
+, alsa-lib
+, gcc-unwrapped
+, git
+, godot3-export-templates
+, godot3-headless
+, libGLU
+, libX11
+, libXcursor
+, libXext
+, libXfixes
+, libXi
+, libXinerama
+, libXrandr
+, libXrender
+, libglvnd
+, libpulseaudio
+, zlib
+}:
+
+
+stdenv.mkDerivation rec {
+  pname = "4D-Minesweeper";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "gapophustu";
+    repo = pname;
+    rev = "db176d8aa5981a597bbae6a1a74aeebf0f376df4";
+    sha256 = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    godot3-headless
+    unzip
+  ];
+
+  buildInputs = [
+    alsa-lib
+    gcc-unwrapped.lib
+    git
+    libGLU
+    libX11
+    libXcursor
+    libXext
+    libXfixes
+    libXi
+    libXinerama
+    libXrandr
+    libXrender
+    libglvnd
+    libpulseaudio
+    zlib
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    # Cannot create file '/homeless-shelter/.config/godot/projects/...'
+    export HOME=$TMPDIR
+
+    # Link the export-templates to the expected location. The --export commands
+    # expects the template-file at .../templates/3.2.3.stable/linux_x11_64_release
+    # with 3.2.3 being the version of godot.
+    mkdir -p $HOME/.local/share/godot
+    ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
+
+    mkdir -p $out/bindontInstall = true;
+    cd source/
+    godot3-headless --export "Linux/X11" $out/bin/4d-minesweeper
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    mkdir -p $out/icons/hicolor/48x48/apps/
+    cp source/icon.svg $out/icons/hicolor/48x48/apps/
+  '';
+
+  dontFixup = true;
+  dontStrip = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "4D Minesweeper";
+      exec = "4d-minesweeper";
+      icon = "icon.svg";
+      comment = meta.description;
+      desktopName = "4D Minesweeper";
+      genericName = "4D Minesweeper";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/gapophustu/4D-Minesweeper";
+    description = "A 4D Minesweeper game written in godot";
+    license = licenses.mpl20;
+    platforms   = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ merspieler ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f06519d632c2..f1be318e55402 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36656,6 +36656,8 @@ with pkgs;
 
   _20kly = callPackage ../games/20kly { };
 
+  _4d-minesweeper = callPackage ../games/4d-minesweeper { };
+
   _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };
 
   aaaaxy = callPackage ../games/aaaaxy { };