From 8a196836aa5b9458c5c4b1fa5f6c6b13363ababa Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Wed, 19 Nov 2025 01:26:20 +0100 Subject: [PATCH] clickhouse, clickhouse-lts: fix darwin builds --- pkgs/by-name/cl/clickhouse/generic.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 72129d8a2b9b..6d15727f68d0 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -125,7 +125,7 @@ llvmStdenv.mkDerivation (finalAttrs: { lib.optional (lib.versions.majorMinor version == "25.8") (fetchpatch { # Disable building WASM lexer url = "https://github.com/ClickHouse/ClickHouse/commit/67a42b78cdf1c793e78c1adbcc34162f67044032.patch"; - sha256 = "7VF+JSztqTWD+aunCS3UVNxlRdwHc2W5fNqzDyeo3Fc="; + hash = "sha256-7VF+JSztqTWD+aunCS3UVNxlRdwHc2W5fNqzDyeo3Fc="; }) ++ @@ -133,8 +133,13 @@ llvmStdenv.mkDerivation (finalAttrs: { (fetchpatch { # Do not intercept memalign on darwin url = "https://github.com/ClickHouse/ClickHouse/commit/0cfd2dbe981727fb650f3b9935f5e7e7e843180f.patch"; - sha256 = "1iNYZbugX2g2dxNR1ZiUthzPnhLUR8g118aG23yhgUo="; - }); + hash = "sha256-1iNYZbugX2g2dxNR1ZiUthzPnhLUR8g118aG23yhgUo="; + }) + ++ lib.optional (!lib.versionAtLeast version "25.11" && stdenv.hostPlatform.isDarwin) (fetchpatch { + # Remove flaky macOS SDK version detection + url = "https://github.com/ClickHouse/ClickHouse/commit/11e172a37bd0507d595d27007170090127273b33.patch"; + hash = "sha256-oI7MrjMgJpIPTsci2IqEOs05dUGEMnjI/WqGp2N+rps="; + }); postPatch = '' patchShebangs src/ utils/