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

astromenace: use xorg.* packages directly instead of xlibsWrapper ind…

authored by Sergei Trofimovich and committed by GitHub ddb10345 b2dbcab0

+2 -2
+2 -2
pkgs/games/astromenace/default.nix
··· 1 - { fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: 2 3 stdenv.mkDerivation rec { 4 pname = "astromenace"; ··· 10 }; 11 12 nativeBuildInputs = [ cmake ]; 13 - buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; 14 15 postBuild = '' 16 ./AstroMenace --pack --rawdata=../RAW_VFS_DATA
··· 1 + { fetchurl, lib, stdenv, cmake, xorg, libGLU, libGL, SDL, openal, fontconfig, freealut, freetype, libogg, libvorbis, runtimeShell }: 2 3 stdenv.mkDerivation rec { 4 pname = "astromenace"; ··· 10 }; 11 12 nativeBuildInputs = [ cmake ]; 13 + buildInputs = [ xorg.libICE xorg.libX11 xorg.libXinerama libGLU libGL SDL openal fontconfig freealut freetype libogg libvorbis ]; 14 15 postBuild = '' 16 ./AstroMenace --pack --rawdata=../RAW_VFS_DATA