Merge pull request #17979 from rardiol/springrts2

Springrts and springlobby update
This commit is contained in:
Domen Kožar 2016-08-26 12:04:50 +02:00 committed by GitHub
commit 6a4e95b918
3 changed files with 22 additions and 4 deletions

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "spring-${version}";
version = "102.0";
version = "103.0";
src = fetchurl {
url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
sha256 = "0gjlpzwl3bdv1ickm8r3xlrbc6dm7m8i968hw3p0an49k6bqa77i";
sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
};
# The cmake included module correcly finds nix's glew, however

View file

@ -0,0 +1,16 @@
--- a/src/utils/slpaths.cpp
+++ b/src/utils/slpaths.cpp
@@ -165,13 +165,10 @@
usync_paths.push_back(bundle);
}
if (!SlPaths::IsPortableMode()) {
- /*
-//FIXME: reenable when #707 is fixed / spring 102.0 is "established"
LSL::SpringBundle systembundle;
if (LSL::SpringBundle::LocateSystemInstalledSpring(systembundle)) {
usync_paths.push_back(systembundle);
}
-*/
std::vector<std::string> paths;
PossibleEnginePaths(paths);

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "springlobby-${version}";
version = "0.247";
version = "0.255";
src = fetchurl {
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
};
buildInputs = [
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
'';
patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
enableParallelBuilding = true;
postInstall = ''