From 4caa00594cba368f65e492742fe318e55dbb964f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 18 Apr 2023 19:46:14 +0000 Subject: systemd: fix precedence in withLibBPF condition The Clang version check was being ignored, as long as the CPU version was greater than 6. Oops. Fixes: 0da24fa3ba0 ("systemd: disable BPF for ARMv5") --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a3c59a5a6c9..57d339b0fba 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -98,7 +98,7 @@ , withImportd ? !stdenv.hostPlatform.isMusl , withKmod ? true , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" - && stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6" # assumes hard floats + && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 , withLibidn2 ? true , withLocaled ? true -- cgit 1.4.1