lix: remove broken perf patch from curl (#534757)
This commit is contained in:
@@ -126,6 +126,19 @@ let
|
||||
''
|
||||
substitute $inputPath $out --replace-fail @deps@ "$(cat ${deps})"
|
||||
'';
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/525953 backported a performance patch
|
||||
# that /somehow/ breaks Lix unit tests.
|
||||
# FIXME revert when the patch is gone in curl drv
|
||||
curl-fixed = curl.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
patches = lib.filter (patch: !lib.strings.hasSuffix "fix-wakeup-consumption.patch" patch) patches;
|
||||
}
|
||||
);
|
||||
in
|
||||
# gcc miscompiles coroutines at least until 13.2, possibly longer
|
||||
# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
|
||||
@@ -243,14 +256,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]
|
||||
++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]
|
||||
++ lib.optionals (withPlugins && finalAttrs.doInstallCheck) [
|
||||
curl
|
||||
curl-fixed
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
brotli
|
||||
bzip2
|
||||
curl
|
||||
curl-fixed
|
||||
capnproto
|
||||
editline
|
||||
openssl
|
||||
|
||||
Reference in New Issue
Block a user