From ac9f3a50a22a72bb554cb6b9192fc6a46bfffff7 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 9 Mar 2012 00:59:13 +0000 Subject: [PATCH] package won't build on the current nixos/nixpkgs (but it did with older checkouts on my other computer). so here is a fix which makes springlobby compile and install at least svn path=/nixpkgs/trunk/; revision=32937 --- pkgs/games/spring/springlobby.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 29ef9558819..06c98411f5b 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar -, gettext, bash, gawk, boost }: +, gettext, bash, gawk, boost}: stdenv.mkDerivation rec { name = "springlobby-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "37cf3aa1ed78a0ded782cc5c692301619dbb2cf4749bccbf059c51707daaf734"; }; - buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost ]; + buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost]; prePatch = '' substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" @@ -18,8 +18,13 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system" ''; + # for now sound is disabled as it causes a linker error with alure i can't resolve (qknight) + cmakeFlags = "-DOPTION_SOUND:BOOL=OFF"; + enableParallelBuilding = true; + #buildPhase = "make VERBOSE=1"; + meta = with stdenv.lib; { homepage = http://springlobby.info/; description = "A free cross-platform lobby client for the Spring RTS project.";