deliantra: refactor and override stdenv

5 files changed, 4 insertions, 10 deletions

diff --git a/pkgs/games/deliantra/deliantra-arch.nix b/pkgs/games/deliantra/arch.nix
index 2201ca2d1f5fb..2201ca2d1f5fb 100644
--- a/pkgs/games/deliantra/deliantra-arch.nix
+++ b/pkgs/games/deliantra/arch.nix
diff --git a/pkgs/games/deliantra/deliantra-data.nix b/pkgs/games/deliantra/data.nix
index 31ed7d0f0118d..31ed7d0f0118d 100644
--- a/pkgs/games/deliantra/deliantra-data.nix
+++ b/pkgs/games/deliantra/data.nix
diff --git a/pkgs/games/deliantra/default.nix b/pkgs/games/deliantra/default.nix
deleted file mode 100644
index 76a06c9601875..0000000000000
--- a/pkgs/games/deliantra/default.nix
+++ /dev/null
@@ -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 {};
-}
diff --git a/pkgs/games/deliantra/deliantra-maps.nix b/pkgs/games/deliantra/maps.nix
index 1f87178102a0c..1f87178102a0c 100644
--- a/pkgs/games/deliantra/deliantra-maps.nix
+++ b/pkgs/games/deliantra/maps.nix
diff --git a/pkgs/games/deliantra/deliantra-server.nix b/pkgs/games/deliantra/server.nix
index e333b7a472f5e..4185a46120e5a 100644
--- a/pkgs/games/deliantra/deliantra-server.nix
+++ b/pkgs/games/deliantra/server.nix
@@ -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