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
This patch has been committed as 3ab8544d5074bd7c648b44c34018dff7a1e12797, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=3ab8544d5074bd7c648b44c34018.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
participants (2)
-
Alyssa Ross -
Yureka Lilian