deliantra-server: remove stdenv overrides

This commit is contained in:
Weijia Wang 2023-12-10 03:52:20 +01:00
parent 9aedfde2aa
commit 7d7c715dfb
3 changed files with 20 additions and 10 deletions

View file

@ -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

View file

@ -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

View file

@ -37676,20 +37676,13 @@ with pkgs;
darkplaces = callPackage ../games/darkplaces { };
deliantra-server = callPackage ../games/deliantra/server.nix {
stdenv = gcc10StdenvCompat;
# perl538 defines 'struct object' in sv.h. many conflicts result
perl = perl536;
perlPackages = perl536Packages;
};
deliantra-arch = callPackage ../games/deliantra/arch.nix {
stdenv = gcc10StdenvCompat;
};
deliantra-maps = callPackage ../games/deliantra/maps.nix {
stdenv = gcc10StdenvCompat;
};
deliantra-data = callPackage ../games/deliantra/data.nix {
stdenv = gcc10StdenvCompat;
};
deliantra-arch = callPackage ../games/deliantra/arch.nix { };
deliantra-maps = callPackage ../games/deliantra/maps.nix { };
deliantra-data = callPackage ../games/deliantra/data.nix { };
ddnet = callPackage ../games/ddnet {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security;