diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 9e400afd6b06..d5277055efd2 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -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