diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-02 12:24:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 12:24:09 +0000 |
| commit | ec161d2240242c215d8280b00aa82f7e3f95d64e (patch) | |
| tree | 32001499525f4a7405958084db302aa141925c50 /pkgs/games/spring/default.nix | |
| parent | 6221782074b04dfe57322b0740883d35cb042615 (diff) | |
| parent | 0224ebfc4cdeac3b4f6c9b813dbce5511221a74a (diff) | |
| download | nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.gz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.bz2 nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.lz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.xz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.zst nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games/spring/default.nix')
| -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 b130a7b5f77..9583895e17a 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; }; } |