deliantra: refactor and override stdenv

This commit is contained in:
Fabián Heredia Montiel 2022-04-15 23:56:27 -05:00
parent 91ffe81b17
commit a8b50d73b2
6 changed files with 16 additions and 12 deletions

View File

@ -1,10 +0,0 @@
pkgs:
let
callPackage = pkgs.callPackage;
in {
deliantra-server = callPackage ./deliantra-server.nix {};
deliantra-arch = callPackage ./deliantra-arch.nix {};
deliantra-maps = callPackage ./deliantra-maps.nix {};
deliantra-data = callPackage ./deliantra-data.nix {};
}

View File

@ -23,16 +23,20 @@ stdenv.mkDerivation rec {
autoconf perl gperf optipng pngnq rsync imagemagick
pkg-config makeWrapper
];
propagatedBuildInputs = perl-deps;
buildInputs = [
blitz boost glib
];
hardeningDisable = [ "format" ];
patches = [
./0001-abs.patch
./0002-datadir.patch
];
postFixup = ''
wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB
wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB

View File

@ -31121,8 +31121,18 @@ with pkgs;
cuyo = callPackage ../games/cuyo { };
inherit (import ../games/deliantra pkgs)
deliantra-server deliantra-arch deliantra-maps deliantra-data;
deliantra-server = callPackage ../games/deliantra/server.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
};
deliantra-arch = callPackage ../games/deliantra/arch.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
};
deliantra-maps = callPackage ../games/deliantra/maps.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
};
deliantra-data = callPackage ../games/deliantra/data.nix {
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
};
ddnet = callPackage ../games/ddnet { };