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

Merge pull request #41153 from baracoder/39689-spring-broken

Browse Source 
spring: Fixed compiling and version bump
This commit is contained in:
xeji 2018-05-29 21:07:08 +02:00 committed by GitHub
commit 094753cb10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/games/spring/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils
, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
, jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip
, jdk ? null, python ? null, systemd, libunwind, which, minizip
, withAI ? true # support for AI Interfaces and Skirmish AIs
}:
stdenv.mkDerivation rec {
name = "spring-${version}";
version = "103.0";
version = "104.0";
src = fetchurl {
url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f";
};
# The cmake included module correcly finds nix's glew, however
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ]
docbook_xsl_ns systemd libunwind which minizip ]
++ stdenv.lib.optional withAI jdk
++ stdenv.lib.optional withAI python;
@ -50,6 +50,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
platforms = platforms.linux;
broken = true;
};
}