* [PATCH] tools: use default clang version
@ 2025-11-02 13:17 Yureka Lilian
2025-11-02 13:55 ` Alyssa Ross
0 siblings, 1 reply; 2+ messages in thread
From: Yureka Lilian @ 2025-11-02 13:17 UTC (permalink / raw)
To: devel; +Cc: Yureka Lilian
Now that we have updated nixpkgs, the default clang version is recent enough to support the required flags
Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-11-02 13:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-02 13:17 [PATCH] tools: use default clang version Yureka Lilian
2025-11-02 13:55 ` Alyssa Ross
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).