diff options
| author | Heinz Deinhart <heinz@nix.at> | 2024-06-26 10:26:22 +0200 |
|---|---|---|
| committer | Heinz Deinhart <heinz@nix.at> | 2024-06-26 10:26:22 +0200 |
| commit | 3ee370f8c64e438f1d3c5b5811f519ab94ac819c (patch) | |
| tree | 419f040eac30a97175189a38b70c1728fcddfa9d | |
| parent | 136c2c93bd57ea98a297fee0057a212c3957f1fb (diff) | |
remove libcurl workaround patch
| -rw-r--r-- | pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch | 13 | ||||
| -rw-r--r-- | pkgs/games/ddnet/default.nix | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch b/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch deleted file mode 100644 index 577cfa3811e15..0000000000000 --- a/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch +++ /dev/null @@ -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); diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 6908f1f57a41c..87ce27e96bffc 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -50,10 +50,6 @@ stdenv.mkDerivation rec { hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg="; }; - patches = [ - ./ddnet-18.2-nixos-libcurl-brotli-disable.patch - ]; - nativeBuildInputs = [ cmake ninja |