diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:01:14 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:01:14 +0200 |
| commit | c04a14edd6096a2d55d3b62ca182739dac9b7ede (patch) | |
| tree | fdf08d8db024a987c90a1f48e5d2319ddc7e3c1b /pkgs/games/spring/default.nix | |
| parent | 44e3fc61fed2ad05cf1ae7d155172dccd0555465 (diff) | |
| parent | 413e9561f817ae4cbeb870f777ec5a66ab34e76c (diff) | |
| download | nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.gz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.bz2 nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.lz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.xz nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.tar.zst nixpkgs-c04a14edd6096a2d55d3b62ca182739dac9b7ede.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games/spring/default.nix')
| -rw-r--r-- | pkgs/games/spring/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index fef1a0f0928..21aca573062 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip +{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; - buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 + buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2 xorg.libX11 xorg.libXcursor libGLU libGL glew curl systemd libunwind which minizip ] ++ lib.optional withAI jdk |