diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
| commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
| tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/games/spring | |
| parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
| parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
| download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip | |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/games/spring')
| -rw-r--r-- | nixpkgs/pkgs/games/spring/fix-certs.patch | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/spring/springlobby.nix | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/games/spring/fix-certs.patch b/nixpkgs/pkgs/games/spring/fix-certs.patch new file mode 100644 index 000000000000..b31160a05cc6 --- /dev/null +++ b/nixpkgs/pkgs/games/spring/fix-certs.patch @@ -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(); + diff --git a/nixpkgs/pkgs/games/spring/springlobby.nix b/nixpkgs/pkgs/games/spring/springlobby.nix index fa7fad3ecd92..8df4450d13d1 100644 --- a/nixpkgs/pkgs/games/spring/springlobby.nix +++ b/nixpkgs/pkgs/games/spring/springlobby.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 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; |