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

Merge pull request #54292 from baracoder/springlobby-ca-fix

Browse Source 
springLobby: Fix TLS problems on map downloads
This commit is contained in:
Domen Kožar 2019-01-20 22:55:07 +07:00 committed by GitHub
commit cb6281a980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/spring/fix-certs.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/downloader/lib/src/Downloader/CurlWrapper.cpp
+++ b/src/downloader/lib/src/Downloader/CurlWrapper.cpp
@@ -108,7 +108,6 @@
if (res != CURLE_OK) {
LOG_WARN("Error setting CURLOPT_CAPATH: %d", res);
}
- return;
}
const std::string cafile = GetCAFilePath();

2
pkgs/games/spring/springlobby.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure
]; ];
patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
enableParallelBuilding = true; enableParallelBuilding = true;