diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
| commit | eeaf5d25d5f6ae7ae1f5bf8a3dee4559693f8147 (patch) | |
| tree | afc41ca8dde96b41089ca324533084aef570322f /nixpkgs/pkgs/games/spring | |
| parent | 63c4c4dda49dc69e5812faa7ef8406180998f3ae (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/games/spring')
| -rw-r--r-- | nixpkgs/pkgs/games/spring/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/games/spring/default.nix b/nixpkgs/pkgs/games/spring/default.nix index e98148cbc83..8f43a6d84b1 100644 --- a/nixpkgs/pkgs/games/spring/default.nix +++ b/nixpkgs/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd libunwind which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; |