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

Merge pull request #116335 from SuperSandro2000/move-aliases.nix

Browse Source
This commit is contained in:
Sandro
2021-04-05 04:07:15 +02:00
committed by GitHub
parent 7ffdeb358b f9bcee4ed5
commit 7c932296e0
237 changed files with 1074 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/freeciv/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3
, zlib, bzip2, curl, lzma, gettext, libiconv
, zlib, bzip2, curl, xz, gettext, libiconv
, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
, gtkClient ? false, gtk3
, qtClient ? false, qt5
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ]
++ optional qtClient [ qt5.wrapQtAppsHook ];
buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ]
buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ]
++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
++ optionals gtkClient [ gtk3 ]
++ optionals qtClient [ qt5.qtbase ]
pkgs/games/spring/default.nix
+2 -2
View File
@@ -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