JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

megaglest: Fix build

Browse Source 
I'm guessing SDL propagated all this previously.
This commit is contained in:
Tuomas Tynkkynen 2016-09-04 14:43:23 +03:00
parent 29796bd989
commit dd3b6ef357
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/games/megaglest/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua { stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
, mesa_drivers }: }:
let let
version = "3.9.2"; version = "3.9.2";
lib-env = buildEnv { lib-env = buildEnv {
name = "megaglest-lib-env"; name = "megaglest-lib-env";
paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; stdenv.cc.cc glew mesa_glu wxGTK ];
}; };
path-env = buildEnv { path-env = buildEnv {
name = "megaglest-path-env"; name = "megaglest-path-env";
@ -24,8 +24,8 @@ stdenv.mkDerivation {
sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv";
}; };
buildInputs = [ cmake git curl SDL xercesc openal lua libjpeg wxGTK buildInputs = [ cmake pkgconfig git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK
cppunit ftgl glew libogg libvorbis makeWrapper mesa_glu mesa_drivers ]; glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
configurePhase = '' configurePhase = ''
cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON