diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-09 00:58:23 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-09 00:59:15 +0100 |
commit | faa599ced67936ce4746b549a8b6dde8af3e003c (patch) | |
tree | 658c49b640a0b58d91065b54648611a600b4af65 | |
parent | dd9aa5d6c948fc9f6955d9d271e868beee773840 (diff) |
springLobby: reformat
-rw-r--r-- | pkgs/games/spring/default.nix | 72 | ||||
-rw-r--r-- | pkgs/games/spring/springlobby.nix | 50 |
2 files changed, 100 insertions, 22 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index f8b05bd97091b..12c3ce59e675b 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,7 +1,31 @@ -{ 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 +{ 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 +, python +, systemd +, libunwind +, which +, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -36,16 +60,36 @@ stdenv.mkDerivation rec { echo "${version} maintenance" > VERSION ''; - cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" - "-DPREFER_STATIC_LIBS:BOOL=OFF"]; + cmakeFlags = [ + "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" + "-DPREFER_STATIC_LIBS:BOOL=OFF" + ]; nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; - 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 - ++ lib.optional withAI python; + 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 + ++ lib.optional withAI python; NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility @@ -57,8 +101,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight domenkozar sorki ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 55c61c4cbd826..6d6a47864a065 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,6 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar -, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring -, makeWrapper, glib, minizip, alure, pcre, jsoncpp }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, wxGTK30 +, openal +, pkg-config +, curl +, libtorrent-rasterbar +, libpng +, libX11 +, gettext +, boost +, libnotify +, gtk2 +, doxygen +, spring +, makeWrapper +, glib +, minizip +, alure +, pcre +, jsoncpp +}: stdenv.mkDerivation rec { pname = "springlobby"; @@ -13,8 +35,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ]; buildInputs = [ - wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk2 glib minizip alure + wxGTK30 + openal + curl + libtorrent-rasterbar + pcre + jsoncpp + boost + libpng + libX11 + libnotify + gtk2 + glib + minizip + alure ]; patches = [ @@ -33,10 +67,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://springlobby.info/"; + homepage = "https://springlobby.springrts.com"; description = "Cross-platform lobby client for the Spring RTS project"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight domenkozar ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } |