diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-10 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 18:01:10 +0000 |
| commit | 1e8386407cedca4b7f39ba561a3b3d5c335ac781 (patch) | |
| tree | 8b02e1869536aee1f3f5958747d43ffd1efa3392 /pkgs/games | |
| parent | 958e403a78f4cc4b11afbd41dc71e2cbd4ac7118 (diff) | |
| parent | d4901634df560379f602b1c4442fd7dd32ee497e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/deliantra/0003-swap.patch | 14 | ||||
| -rw-r--r-- | pkgs/games/deliantra/server.nix | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/games/deliantra/0003-swap.patch b/pkgs/games/deliantra/0003-swap.patch new file mode 100644 index 0000000000000..fa4e2bdec425b --- /dev/null +++ b/pkgs/games/deliantra/0003-swap.patch @@ -0,0 +1,14 @@ +--- a/include/util.h ++++ b/include/util.h +@@ -449,6 +449,11 @@ struct slice_allocator + { + p->~Tp (); + } ++ ++ bool operator ==(const slice_allocator &) const ++ { ++ return true; ++ } + }; + + // basically a memory area, but refcounted diff --git a/pkgs/games/deliantra/server.nix b/pkgs/games/deliantra/server.nix index 4185a46120e5a..08889dd2302d7 100644 --- a/pkgs/games/deliantra/server.nix +++ b/pkgs/games/deliantra/server.nix @@ -35,8 +35,11 @@ stdenv.mkDerivation rec { patches = [ ./0001-abs.patch ./0002-datadir.patch + ./0003-swap.patch ]; + env.CXXFLAGS = "-std=c++11"; + postFixup = '' wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB |