From bfa191404f33bc72d6b6fa1647ea3462ebacdbe4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 29 Oct 2022 19:19:41 +0100
Subject: [PATCH] voxelands: use xorg.* packages directly instead of
 xlibsWrapper indirection

Tested as no material change in `out` output with `diffoscope`.
---
 pkgs/games/voxelands/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index 0d28a93e401e..906c3b9bd36c 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -3,9 +3,14 @@
 , bzip2
 , cmake
 , expat
+, freetype
 , irrlicht
+, libICE
 , libGL
 , libGLU
+, libSM
+, libX11
+, libXext
 , libXxf86vm
 , libjpeg
 , libpng
@@ -13,7 +18,6 @@
 , openal
 , pkg-config
 , sqlite
-, xlibsWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -39,18 +43,24 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    # has to go before others to override transitive libpng-1.6
+    libpng
+
     bzip2
     expat
+    freetype
     irrlicht
+    libICE
     libGL
     libGLU
+    libSM
+    libX11
+    libXext
     libXxf86vm
     libjpeg
-    libpng
     libvorbis
     openal
     sqlite
-    xlibsWrapper
   ];
 
   meta = with lib; {