From dd3b6ef357b18a5fd1793c803f4d54ec080f70a0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Sep 2016 14:43:23 +0300 Subject: [PATCH] megaglest: Fix build I'm guessing SDL propagated all this previously. --- pkgs/games/megaglest/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index a514cec7edc..b2a1fd499df 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -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 -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu -, mesa_drivers }: +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +}: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext 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 { name = "megaglest-path-env"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; }; - buildInputs = [ cmake git curl SDL xercesc openal lua libjpeg wxGTK - cppunit ftgl glew libogg libvorbis makeWrapper mesa_glu mesa_drivers ]; + buildInputs = [ cmake pkgconfig git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON