Merge pull request #195043 from trofi/astromenace-without-xlibsWrapper

astromenace: use xorg.* packages directly instead of xlibsWrapper ind…
This commit is contained in:
Sergei Trofimovich 2022-10-11 23:22:50 +01:00 committed by GitHub
commit ddb10345b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }:
{ fetchurl, lib, stdenv, cmake, xorg, libGLU, libGL, SDL, openal, fontconfig, freealut, freetype, libogg, libvorbis, runtimeShell }:
stdenv.mkDerivation rec {
pname = "astromenace";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ];
buildInputs = [ xorg.libICE xorg.libX11 xorg.libXinerama libGLU libGL SDL openal fontconfig freealut freetype libogg libvorbis ];
postBuild = ''
./AstroMenace --pack --rawdata=../RAW_VFS_DATA