diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-10-29 19:19:41 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-10-30 11:34:37 +0100 |
| commit | bfa191404f33bc72d6b6fa1647ea3462ebacdbe4 (patch) | |
| tree | 71fdc7dfd59a58c7b5f38125410a2d81bbcb224a /pkgs/games/voxelands | |
| parent | 3809602fd4cc838f0a35e79f94afed056db814cc (diff) | |
| download | nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar.gz nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar.bz2 nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar.lz nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar.xz nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.tar.zst nixlib-bfa191404f33bc72d6b6fa1647ea3462ebacdbe4.zip | |
voxelands: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
Diffstat (limited to 'pkgs/games/voxelands')
| -rw-r--r-- | pkgs/games/voxelands/default.nix | 16 |
1 files 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; { |