From 0a17a5998db2f05ecd587221a4a8f5f16f1e551b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Dec 2024 14:56:39 +0100
Subject: [PATCH 1/2] maintainers: add marcin-serwin

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 396133bf4161..c1502d4cc6f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14309,6 +14309,13 @@
     githubId = 30194994;
     name = "Felix Nilles";
   };
+  marcin-serwin = {
+    name = "Marcin Serwin";
+    github = "marcin-serwin";
+    githubId = 12128106;
+    email = "marcin@serwin.dev";
+    keys = [ { fingerprint = "F311 FA15 1A66 1875 0C4D  A88D 82F5 C70C DC49 FD1D"; } ];
+  };
   marcovergueira = {
     email = "vergueira.marco@gmail.com";
     github = "marcovergueira";

From 86290471a72b06e67de5eaee1aa55e44fc47b65b Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 9 Feb 2025 15:22:01 -0500
Subject: [PATCH 2/2] blackvoxel: init at 2.5

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/bl/blackvoxel/package.nix | 84 ++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/by-name/bl/blackvoxel/package.nix

diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix
new file mode 100644
index 000000000000..f5d23abf41bd
--- /dev/null
+++ b/pkgs/by-name/bl/blackvoxel/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  imagemagick,
+  glew110,
+  SDL_compat,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "blackvoxel";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "Blackvoxel";
+    repo = "Blackvoxel";
+    tag = finalAttrs.version;
+    hash = "sha256-Uj3TfxAsLddsPiWDcLKjpduqvgVjnESZM4YPHT90YYY=";
+  };
+
+  nativeBuildInputs = [ imagemagick ];
+
+  buildInputs = [
+    glew110
+    SDL_compat
+  ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace src/sc_Squirrel3/sq/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/sqstdlib/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/squirrel/Makefile --replace-fail " -m64" ""
+  '';
+
+  buildFlags = [ "BV_DATA_LOCATION_DIR=${placeholder "out"}/data" ];
+
+  # data/gui/gametype_back.bmp isn't exactly the official icon but since
+  # there is no official icon we use that one
+  postBuild = ''
+    convert gui/gametype_back.bmp blackvoxel.png
+  '';
+
+  installFlags = [
+    "doinstall=true"
+    "BV_DATA_INSTALL_DIR=${placeholder "out"}/data"
+    "BV_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
+  ];
+
+  postInstall = ''
+    install -Dm644 blackvoxel.png $out/share/icons/hicolor/1024x1024/apps/blackvoxel.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "blackvoxel";
+      desktopName = "Blackvoxel";
+      exec = "blackvoxel";
+      icon = "blackvoxel";
+      categories = [ "Game" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A Sci-Fi game with industry and automation";
+    homepage = "https://www.blackvoxel.com";
+    changelog = "https://github.com/Blackvoxel/Blackvoxel/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [
+      # blackvoxel
+      gpl3Plus
+      # Squirrel
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      ethancedwards8
+      marcin-serwin
+    ];
+    platforms = lib.platforms.linux;
+  };
+})