diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-15 12:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 12:01:18 +0000 |
| commit | eba04b34853b367e577138767ba1d0500922855b (patch) | |
| tree | a9972e0aa082e9bae4e0b68ed86523a952f4bd3a /pkgs/games | |
| parent | c46eae0f3572fbe7af42e5d40648b7b4a1d1317b (diff) | |
| parent | cdc9fc87a3be875d258c88184c6b0bff1d7ca3e4 (diff) | |
Merge master into staging-next
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" |