From 2549b34e16e76b694309775fbc2dde9469d2e887 Mon Sep 17 00:00:00 2001 From: Zaechus Date: Sat, 10 May 2025 16:00:03 -0600 Subject: [PATCH] rbdoom-3-bfg: 1.5.1 -> 1.6.0 --- pkgs/by-name/rb/rbdoom-3-bfg/package.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix index 137be74c7a0d..7dbf12a24e54 100644 --- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix +++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix @@ -2,12 +2,10 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, directx-shader-compiler, - libGLU, - libpng, - libjpeg_turbo, + ispc, + ncurses, openal, rapidjson, SDL2, @@ -18,22 +16,16 @@ stdenv.mkDerivation rec { pname = "rbdoom-3-bfg"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "RobertBeckebans"; repo = pname; rev = "v${version}"; - hash = "sha256-bjjeTdbQDWTibSrIWhCnr6F0Ef17efLgWGQAAwezjUw="; + hash = "sha256-9BZEFO+e5IG6hv9+QI9OJecQ84rLTWBDz4k0GU6SeDE="; fetchSubmodules = true; }; - patches = fetchpatch { - name = "replace-HLSL-ternary-operators.patch"; - url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/feffa4a4dd9a2a5f3c608f720cde41bea37797d3.patch"; - hash = "sha256-aR1eoWZL3+ps7P7yFXFvGsMFxpUSBDiyBsja/ISin4I="; - }; - postPatch = '' substituteInPlace neo/extern/nvrhi/tools/shaderCompiler/CMakeLists.txt \ --replace "AppleClang" "Clang" @@ -42,12 +34,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake directx-shader-compiler + ispc ]; buildInputs = [ - libGLU - libpng - libjpeg_turbo + ncurses openal rapidjson SDL2 @@ -60,9 +51,6 @@ stdenv.mkDerivation rec { 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" ];