diff options
| author | Domen Kožar <domen@dev.si> | 2020-03-20 23:37:21 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2020-03-20 23:37:43 +0100 |
| commit | a64f6187d497c4bd26641babc040106be5b05368 (patch) | |
| tree | aa3288ed8bc3981ab471770c6c0eb4575874a830 /pkgs/games/spring | |
| parent | cbceee8e9755395f0ad843cdbf2a259ba1ab10e1 (diff) | |
| download | nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar.gz nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar.bz2 nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar.lz nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar.xz nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.tar.zst nixpkgs-a64f6187d497c4bd26641babc040106be5b05368.zip | |
spring{,Lobby}: make it build, still tells me unsynced though
Diffstat (limited to 'pkgs/games/spring')
| -rw-r--r-- | pkgs/games/spring/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/games/spring/springlobby.nix | 6 |
2 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 8f43a6d84b1..1cfb6c6e460 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip +{ stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip @@ -6,13 +6,15 @@ }: stdenv.mkDerivation rec { - pname = "spring"; - version = "104.0"; - - src = fetchurl { - url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; - sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f"; + version = "104.0.1"; + + src = fetchFromGitHub { + owner = "spring"; + repo = "spring"; + rev = version; + sha256 = "1z7c5yxsv0j4nlkmc0limxxkl5mp65jckjfh7nyv3a3zvzhv00zc"; + fetchSubmodules = true; }; # The cmake included module correcly finds nix's glew, however @@ -21,8 +23,12 @@ stdenv.mkDerivation rec { 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" + substituteInPlace ./rts/Rendering/GL/myGL.cpp \ + --replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName" patchShebangs . rm rts/build/cmake/FindGLEW.cmake + + echo "104.0.1-1466-g9ee29da maintenance" > VERSION ''; cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" @@ -50,6 +56,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index dbcec10fdc6..f872d217237 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "springlobby"; - version = "0.267"; + version = "0.269"; src = fetchurl { - url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak"; + url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2"; + sha256 = "1shgrfs4ssjj8m0c7805jisjzpc60796l0vja3yjfdksrz7yxvhg"; }; nativeBuildInputs = [ pkgconfig ]; |