diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/games/spring | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/games/spring')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/games/spring/springlobby.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/games/spring/springlobby.nix b/infra/libkookie/nixpkgs/pkgs/games/spring/springlobby.nix index 9912675ee673..33dc364c5b70 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/spring/springlobby.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar +{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -11,13 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; buildInputs = [ - cmake wxGTK30 openal curl gettext libtorrentRasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure + wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp + boost libpng libX11 libnotify gtk2 glib minizip alure ]; - patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed + patches = [ + ./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed + ./fix-certs.patch + (fetchpatch { + url = "https://github.com/springlobby/springlobby/commit/252c4cb156c1442ed9b4faec3f26265bc7c295ff.patch"; + sha256 = "sha256-Nq1F5fRPnCkZwl9KgrfuUmpIMK3hUOyZQYIKElWpmzU="; + }) + ]; enableParallelBuilding = true; |