mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 15:27:50 +00:00
voxelands: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
This commit is contained in:
parent
3809602fd4
commit
bfa191404f
@ -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; {
|
||||
|
Loading…
Reference in New Issue
Block a user