mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 03:14:03 +00:00
remove libcurl workaround patch
This commit is contained in:
parent
136c2c93bd
commit
3ee370f8c6
@ -1,13 +0,0 @@
|
||||
diff -ur ddnet-18.2/src/engine/shared/http.cpp ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp
|
||||
--- ddnet-18.2/src/engine/shared/http.cpp 2024-04-30 20:27:51.000000000 +0200
|
||||
+++ ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp 2024-05-05 21:17:33.792870233 +0200
|
||||
@@ -146,7 +146,8 @@
|
||||
curl_easy_setopt(pH, CURLOPT_URL, m_aUrl);
|
||||
curl_easy_setopt(pH, CURLOPT_NOSIGNAL, 1L);
|
||||
curl_easy_setopt(pH, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
|
||||
- curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
|
||||
+ // curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
|
||||
+ curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, "gzip, deflate"); // NixOS libcurl workaround: don't use brotli
|
||||
|
||||
curl_easy_setopt(pH, CURLOPT_HEADERDATA, this);
|
||||
curl_easy_setopt(pH, CURLOPT_HEADERFUNCTION, HeaderCallback);
|
@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./ddnet-18.2-nixos-libcurl-brotli-disable.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
Loading…
Reference in New Issue
Block a user