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

spring{,Lobby}: make it build, still tells me unsynced though

Browse Source
This commit is contained in:
Domen Kožar 2020-03-20 23:37:21 +01:00
parent cbceee8e97
commit a64f6187d4
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL
, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
, jdk ? null, python ? null, systemd, libunwind, which, minizip , jdk ? null, python ? null, systemd, libunwind, which, minizip
@ -6,13 +6,15 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spring"; pname = "spring";
version = "104.0"; version = "104.0.1";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; owner = "spring";
sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f"; repo = "spring";
rev = version;
sha256 = "1z7c5yxsv0j4nlkmc0limxxkl5mp65jckjfh7nyv3a3zvzhv00zc";
fetchSubmodules = true;
}; };
# The cmake included module correcly finds nix's glew, however # The cmake included module correcly finds nix's glew, however
@ -21,8 +23,12 @@ stdenv.mkDerivation rec {
substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \ substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \
--replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\ --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\
--replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages" --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 . patchShebangs .
rm rts/build/cmake/FindGLEW.cmake rm rts/build/cmake/FindGLEW.cmake
echo "104.0.1-1466-g9ee29da maintenance" > VERSION
''; '';
cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
@ -50,6 +56,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }

6
pkgs/games/spring/springlobby.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "springlobby"; pname = "springlobby";
version = "0.267"; version = "0.269";
src = fetchurl { src = fetchurl {
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2";
sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak"; sha256 = "1shgrfs4ssjj8m0c7805jisjzpc60796l0vja3yjfdksrz7yxvhg";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];