ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108062 from siraben/spring-update

Browse Source 
spring: refactor
This commit is contained in:
Domen Kožar 2021-01-02 10:57:12 +00:00 committed by GitHub
commit 77839b5a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
};
}

1
pkgs/top-level/all-packages.nix
View File

@ -26329,6 +26329,7 @@ in
space-orbit = callPackage ../games/space-orbit { };
spring = callPackage ../games/spring {
asciidoc = asciidoc-full;
boost = boost155;
};