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 65FA621B12; Sun, 02 Nov 2025 13:18:06 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 1829221B07; Sun, 02 Nov 2025 13:18:04 +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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail.cyberchaos.dev (mail.cyberchaos.dev [IPv6:2a0f:4ac0::3a11]) by atuin.qyliss.net (Postfix) with ESMTPS id 091A521A8B for ; Sun, 02 Nov 2025 13:18:03 +0000 (UTC) From: Yureka Lilian DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cyberchaos.dev; s=mail; t=1762089479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=n/TLXG0QPz8+4lkkXdZC2il8CA8AFaPjMamiISDz8Jk=; b=CqTFv60RFYrHcUF+V4rYjQqLUhAyRTTe8ONt1DheKeGIJSEhnYtdJRnwtUkKceB2bmLakj sM7JfXacbYZ3yHWa26WKj/K4+NNV5IozGfUs9UAlW7AeqVT52txLDICboBA9dqLHu0f12H hoKk5QRAgOtnkCn9nQR3g/QYNYwf5vg= To: devel@spectrum-os.org Subject: [PATCH] tools: use default clang version Date: Sun, 2 Nov 2025 14:17:20 +0100 Message-ID: <20251102131725.10074-1-yureka@cyberchaos.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: PJ7IWARE7NYP54A2WBCP2DZNO7KZLA5Y X-Message-ID-Hash: PJ7IWARE7NYP54A2WBCP2DZNO7KZLA5Y X-MailFrom: yureka@cyberchaos.dev 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: Now that we have updated nixpkgs, the default clang version is recent enough to support the required flags Signed-off-by: Yureka Lilian --- tools/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/default.nix b/tools/default.nix index de5a3b8..398f570 100644 --- a/tools/default.nix +++ b/tools/default.nix @@ -7,8 +7,7 @@ import ../lib/call-package.nix ( , meson, ninja, pkg-config, rustc , clang-tools, clippy, jq , dbus, linuxHeaders -# clang 19 (current nixpkgs default) is too old to support -fwrapv-pointer -, clang_21, libbpf +, clang, libbpf , buildSupport ? false , appSupport ? true , hostSupport ? false @@ -87,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja ] ++ lib.optionals (appSupport || driverSupport) [ pkg-config ] ++ lib.optionals hostSupport [ rustc ] - ++ lib.optionals driverSupport [ clang_21.cc ]; + ++ lib.optionals driverSupport [ clang.cc ]; buildInputs = lib.optionals appSupport [ dbus ] ++ lib.optionals driverSupport [ libbpf linuxHeaders ]; -- 2.51.0