summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-11-21 11:38:08 +0800
committerGitHub <noreply@github.com>2021-11-21 11:38:08 +0800
commit2dda9942518d5d4d675239b030a11c5346788512 (patch)
tree86667fe0c0b32bb9f45db742358b996fbe950988
parent67a678d032094eed9b477d2c4c96cc2f22b8f628 (diff)
parent2ea5321fb97433503844e40aa96b7d4d5ca9f5b6 (diff)
Merge pull request #146597 from trofi/fix-trafficserver-for-ncurses-6.3
trafficserver: pull upstream fix for ncurses-6.3
-rw-r--r--pkgs/servers/http/trafficserver/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index e7ce72e086e1..eb4af7bf4918 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -63,6 +63,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
})
+
+ # Fix build against ncurses-6.3:
+ # https://github.com/apache/trafficserver/pull/8437
+ (fetchpatch {
+ url = "https://github.com/apache/trafficserver/commit/66c86c6b082903a92b9db33c60e3ed947e77d540.patch";
+ sha256 = "1hgpp80xnnjr4k5i6gcllrb7dw4q4xcdrkwxpc1xk2np5cbyxd16";
+ })
];
# NOTE: The upstream README indicates that flex is needed for some features,