From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8B42B7BC7; Tue, 04 Nov 2025 18:33:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id C79147BB7; Tue, 04 Nov 2025 18:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b6-smtp.messagingengine.com (fhigh-b6-smtp.messagingengine.com [202.12.124.157]) by atuin.qyliss.net (Postfix) with ESMTPS id BDD117BB5 for ; Tue, 04 Nov 2025 18:33:13 +0000 (UTC) Received: from phl-compute-11.internal (phl-compute-11.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id 926A07A00B1; Tue, 4 Nov 2025 13:33:11 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Tue, 04 Nov 2025 13:33:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1762281191; x=1762367591; bh=ieuL+93WkEeVRYJD0jdLV 6yRqD2zptbKqXnKitaizA8=; b=NYt0fXACOLRjCMJ6RtTU2nxb8LbAchNLt+Sm8 ylAE/t9dDMgeALfqPDvgZuwTs+XqerEkfKtGtz5GflHcbN8YAL5RlsAbVgCqNKmv qsbdWjOAY56Q/zTF0tztaJJ4OZso5/cabcmdcnBvc00QzCiMy/u4oA4MXzTbsmi+ kacGSiAxz/3Agc6N2nxraNPCxQsKDJ0laaETIRvsVixh36dnKZ8BgrH+c9Ys42jJ 27o6OsjzHNOcqtB+2hvNiC7etehJRf7VaKrNWKlp5E++8OmsVHnqDWCCPbycKYSB r0wT7YzykLBVTcDS+hH5ADjn7+mJMLFesopSJyo1tv4J/GJag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1762281191; x=1762367591; bh=ieuL+93WkEeVRYJD0jdLV6yRqD2zptbKqXn KitaizA8=; b=wzXWCv7wPh0q0Ernw66AharQgWxsdXLDNNdFDYhsImjyww+fUeb 1CqbNxzNYe/uIHblxnm5/6TXwjElvSdB3LdhWh3fk58Jvula48z+QlxnJfif2ud5 Fx/qXjEz9s1KRvf2Qa5g2UjMTr2oCH39KTd/F2+8IwX5CoKcq6Fw3QyEqkeWEPNK 3S1hGQ45W+VSBQTvCKpObfmfj0Fe11qIChHC/aNcvj6jgPdJlOW4pn6R+xefe0tQ jgP/5KxkljP93VbdRGgGCGgsvbtmqxM95o8FX5TS+B/GRfSOJBx37qszrm0vxPD7 trh8e0MOyYSrLCuv2ONfeXldqjk4jtc8syQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddukedujeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptehlhihsshgrucft ohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepheekgfdtve ettdekuddugeeugfdujeehuefgleegtedthfffudfhheduhfduuefhnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrih hspdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeih uhhrvghkrgestgihsggvrhgthhgrohhsrdguvghvpdhrtghpthhtohepuggvvhgvlhessh hpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 4 Nov 2025 13:33:09 -0500 (EST) Received: by mbp.qyliss.net (Postfix, from userid 1000) id BECBC64B4CA2; Tue, 04 Nov 2025 19:33:08 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] tools: use llvmPackages as input Date: Tue, 4 Nov 2025 19:33:00 +0100 Message-ID: <20251104183300.3153163-1-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: EPKPANSRJ5Y6FWF7FKYMZLO3HFAV7HD7 X-Message-ID-Hash: EPKPANSRJ5Y6FWF7FKYMZLO3HFAV7HD7 X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka Lilian X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This makes sure that clang and clang-tidy will be using the same version of LLVM. (It's looking like we might also need LLVM libunwind at some point, so that's another thing we could take from a single llvmPackages.) Signed-off-by: Alyssa Ross --- tools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/default.nix b/tools/default.nix index 398f570..06b7ed2 100644 --- a/tools/default.nix +++ b/tools/default.nix @@ -5,9 +5,9 @@ import ../lib/call-package.nix ( { src, lib, stdenv, fetchCrate, fetchurl, runCommand, buildPackages , meson, ninja, pkg-config, rustc -, clang-tools, clippy, jq +, llvmPackages, clippy, jq , dbus, linuxHeaders -, clang, libbpf +, libbpf , buildSupport ? false , appSupport ? true , hostSupport ? false @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja ] ++ lib.optionals (appSupport || driverSupport) [ pkg-config ] ++ lib.optionals hostSupport [ rustc ] - ++ lib.optionals driverSupport [ clang.cc ]; + ++ lib.optionals driverSupport [ llvmPackages.clang-unwrapped ]; buildInputs = lib.optionals appSupport [ dbus ] ++ lib.optionals driverSupport [ libbpf linuxHeaders ]; @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { # clang-tools needs to be before clang, otherwise it will not use # the Nix include path correctly and fail to find headers - nativeBuildInputs = [ clang-tools jq ] ++ nativeBuildInputs; + nativeBuildInputs = [ llvmPackages.clang-tools jq ] ++ nativeBuildInputs; buildPhase = '' jq -r '.[].file | select(endswith(".c"))' compile_commands.json | base-commit: 1d666582892fbdf812662b4490caf7821078eaf9 -- 2.51.0