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

spring: refactor

Browse Source
This commit is contained in:
Ben Siraphob 2021-01-01 00:20:18 +07:00
parent b09a961ddf
commit d55a9e23b6
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 { 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, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
, jdk ? null, python ? null, systemd, libunwind, which, minizip , jdk ? null, python ? null, systemd, libunwind, which, minizip
, withAI ? true # support for AI Interfaces and Skirmish AIs , 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 # taken from https://github.com/spring/spring/commits/maintenance
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spring"; owner = "spring";
repo = "spring"; repo = pname;
inherit rev; inherit rev;
sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v";
fetchSubmodules = true; fetchSubmodules = true;
@ -40,14 +40,13 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"]; "-DPREFER_STATIC_LIBS:BOOL=OFF"];
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];
xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
docbook_xsl_ns systemd libunwind which minizip ] xorg.libX11 xorg.libXcursor libGLU libGL glew curl
systemd libunwind which minizip ]
++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI jdk
++ stdenv.lib.optional withAI python; ++ stdenv.lib.optional withAI python;
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
postInstall = '' postInstall = ''
@ -59,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = "https://springrts.com/"; homepage = "https://springrts.com/";
description = "A powerful real-time strategy (RTS) game engine"; description = "A powerful real-time strategy (RTS) game engine";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ]; maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

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

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