From 4bde58a2241c665336323ab847078498d72d9b8e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 18 Jan 2023 20:23:11 +0100 Subject: [PATCH] haskellPackages.curl: fix build with curl >= 7.87 --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 94d94f180c8..ec9b70f4a0c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -474,6 +474,15 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; + # curl 7.87.0 introduces a preprocessor typechecker of sorts which fails on + # incorrect usages of curl_easy_getopt and similar functions. Presumably + # because the wrappers in curlc.c don't use static values for the different + # arguments to curl_easy_getinfo, it complains and needs to be disabled. + # https://github.com/GaloisInc/curl/issues/28 + curl = appendConfigureFlags [ + "--ghc-option=-DCURL_DISABLE_TYPECHECK" + ] super.curl; + # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket;