spring, springlobby update (#15182)

* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247

4 files changed, 46 insertions, 17 deletions

diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
new file mode 100644
index 000000000000..200ff1ca2e7f
--- /dev/null
+++ b/pkgs/development/libraries/alure/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, openal }:
+
+stdenv.mkDerivation rec {
+  name = "alure-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
+    sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
+  };
+
+  buildInputs = [ cmake openal ];
+
+  meta = with stdenv.lib; {
+    description = "A utility library to help manage common tasks with OpenAL applications";
+    homepage = http://kcat.strangesoft.net/alure.html;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 525adbc0a123..9e4a0954272b 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,32 +1,41 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
-, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils
+, openal, libvorbis, glew, freetype, xorg, SDL2, mesa, binutils
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
-, jdk ? null, python ? null, systemd
+, jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
 
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "96.0";
+  version = "101.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "1axyqkxgv3a0zg0afzlc7j3lyi412zd551j317ci41yqz2qzf0px";
+    sha256 = "0nr65zhw92k36zgwqgi31vcp129vk7r3v7xzd6l9w7mp1ljvypgi";
   };
 
+  # The cmake included module correcly finds nix's glew, however
+  # it has to be the bundled FindGLEW for headless or dedicated builds
+  prePatch = ''
+    substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \
+      --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\
+      --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages"
+    patchShebangs .
+    rm rts/build/cmake/FindGLEW.cmake
+  '';
+
   cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
                 "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
                 "-DPREFER_STATIC_LIBS:BOOL=OFF"];
 
-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
+  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
     xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
-    docbook_xsl_ns systemd ]
+    docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 
-  # reported upstream http://springrts.com/mantis/view.php?id=4305
-  #enableParallelBuilding = true; # occasionally missing generated files on Hydra
+  enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
 
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index bbcbd1920e9d..571cf311545a 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
-, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring, makeWrapper }:
+{ stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
+, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring
+, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.195";
+  version = "0.247";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0hxxm97c74rvm78vlfn2byn0zjlrhankxdrs2hz73rdq6451h10b";
+    sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
   };
 
   buildInputs = [
-    cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar
-    boost libpng libX11 libnotify gtk doxygen makeWrapper
+    cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp
+    boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure
   ];
 
   prePatch = ''
@@ -21,9 +22,6 @@ 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;
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85c2afd4a540..cb067817f548 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6416,6 +6416,8 @@ in
 
   afflib = callPackage ../development/libraries/afflib { };
 
+  alure = callPackage ../development/libraries/alure { };
+
   agg = callPackage ../development/libraries/agg { };
 
   allegro = callPackage ../development/libraries/allegro {};