From 1c128e7c73ab8bbf36561db244a73bb5a4534300 Mon Sep 17 00:00:00 2001 From: Zaechus Date: Sun, 12 Feb 2023 00:52:14 -0700 Subject: [PATCH 1/2] maintainers: add Zaechus --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18b4118d6310..b614ea6655e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16352,6 +16352,12 @@ githubId = 908716; name = "Zach Coyle"; }; + Zaechus = { + email = "zaechus@proton.me"; + github = "Zaechus"; + githubId = 19353212; + name = "Maxwell Anderson"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; From c9bef7694e8473f3678272a25a8732ae4c8d0a7b Mon Sep 17 00:00:00 2001 From: Zaechus Date: Sun, 12 Feb 2023 00:55:26 -0700 Subject: [PATCH 2/2] rbdoom-3-bfg: init at 1.4.0 --- pkgs/games/rbdoom-3-bfg/default.nix | 82 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/games/rbdoom-3-bfg/default.nix diff --git a/pkgs/games/rbdoom-3-bfg/default.nix b/pkgs/games/rbdoom-3-bfg/default.nix new file mode 100644 index 000000000000..99264a19e3c3 --- /dev/null +++ b/pkgs/games/rbdoom-3-bfg/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, directx-shader-compiler +, libGLU +, libpng +, libjpeg_turbo +, openal +, rapidjson +, SDL2 +, vulkan-headers +, vulkan-loader +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rbdoom-3-bfg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "RobertBeckebans"; + repo = pname; + rev = "v${version}"; + hash = "sha256-r/dvTirgFXdBJ+Gjl6zpHoGCTPoo0tRmOCV9oCdnltI="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + name = "remove-jpeg_internals-define.patch"; + url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/de6ab9d31ffcd6eba26df69f8c77da38a0ab4722.diff"; + hash = "sha256-3XbWmQtY/8a90IqDtN5TNT5EOa+i5mFOH+H9tuZqTmU="; + }) + ]; + + nativeBuildInputs = [ + cmake + directx-shader-compiler + ]; + + buildInputs = [ + libGLU + libpng + libjpeg_turbo + openal + rapidjson + SDL2 + vulkan-headers + vulkan-loader + zlib + ]; + + cmakeDir = "../neo"; + cmakeFlags = [ + "-DFFMPEG=OFF" + "-DBINKDEC=ON" + "-DUSE_SYSTEM_LIBGLEW=ON" + "-DUSE_SYSTEM_LIBPNG=ON" + "-DUSE_SYSTEM_LIBJPEG=ON" + "-DUSE_SYSTEM_RAPIDJSON=ON" + "-DUSE_SYSTEM_ZLIB=ON" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install RBDoom3BFG $out/bin/RBDoom3BFG + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG"; + description = "Doom 3 BFG Edition with modern engine features"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ Zaechus ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6ac9a1a4ed..281cc41c6a85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34791,6 +34791,8 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; + rbdoom-3-bfg = callPackage ../games/rbdoom-3-bfg { }; + ### GAMES/LGAMES barrage = callPackage ../games/lgames/barrage { };