From b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 26 Oct 2020 22:33:13 +0100 Subject: [PATCH 1/2] springlobby: patch libcurl cmake configuration --- pkgs/games/spring/springlobby.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 9912675ee673..39a6243d08ba 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/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 }: @@ -17,7 +17,14 @@ stdenv.mkDerivation rec { boost libpng libX11 libnotify gtk2 doxygen makeWrapper 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; From 8dee03f40dd7e9389be11b68e4c3d4d9bc3c3555 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 26 Oct 2020 22:33:58 +0100 Subject: [PATCH 2/2] springlobby: move build tools to nativeBuildInputs --- pkgs/games/spring/springlobby.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 39a6243d08ba..33dc364c5b70 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -11,10 +11,10 @@ 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 = [