diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-15 12:26:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 12:26:43 +0200 |
| commit | 229ee1db6623dc78e68bb5caf9be9a09f72c1513 (patch) | |
| tree | 3660de57848a1c9574925ebdfa6b81724996cb76 /pkgs/games | |
| parent | a2dbeea75f2ac054084c9100235157f034fc74dc (diff) | |
| parent | 70ed962531e40d3cde42bd8c66a8d58c1799e1ee (diff) | |
Merge pull request #267340 from a-n-n-a-l-e-e/rbdoom-3-fix-build
rbdoom-3-bfg: apply upstream patch; fix build
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/doom-ports/rbdoom-3-bfg/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix index c17adb72171f4..7ec57b7151380 100644 --- a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix +++ b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , directx-shader-compiler , libGLU @@ -26,6 +27,12 @@ stdenv.mkDerivation rec { 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" |