diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2020-10-26 22:33:13 +0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2020-10-26 22:33:13 +0100 |
| commit | b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96 (patch) | |
| tree | 1c5cb78f65d93438fc17ad806b1ecf63720d8aaa /pkgs | |
| parent | c851af868fe48ed9305d115093ca8bea56dffeac (diff) | |
| download | nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar.gz nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar.bz2 nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar.lz nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar.xz nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.tar.zst nixpkgs-b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96.zip | |
springlobby: patch libcurl cmake configuration
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/spring/springlobby.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 9912675ee67..39a6243d08b 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; |