diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
commit | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (patch) | |
tree | 4df43f65ad5ba49f281d340c3012d63f5d37e8e9 /pkgs/games | |
parent | c2884c4011a9496b67ae2ccd8af126854628014b (diff) | |
parent | 279110cd86e9c969f8f2942675f7c73cfe4059d3 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/spring/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index b130a7b5f77e1..9583895e17a3e 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,6 +1,6 @@ { 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 +, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # taken from https://github.com/spring/spring/commits/maintenance src = fetchFromGitHub { owner = "spring"; - repo = "spring"; + repo = pname; inherit rev; sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; fetchSubmodules = true; @@ -40,14 +40,13 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DPREFER_STATIC_LIBS:BOOL=OFF"]; - buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper - docbook_xsl_ns systemd libunwind which minizip ] + nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; + buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 + xorg.libX11 xorg.libXcursor libGLU libGL glew curl + systemd libunwind which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility postInstall = '' @@ -59,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ]; + maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; platforms = platforms.linux; }; } |