diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-04-18 19:46:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-04-19 18:31:01 +0000 |
| commit | 4caa00594cba368f65e492742fe318e55dbb964f (patch) | |
| tree | 8284f4928bf2296bf89ed178be41fc98a341bce3 /pkgs/os-specific/linux/systemd | |
| parent | a0e9b4b276341da5b9ebbaf0f28e0d5fccc35168 (diff) | |
| download | nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar.gz nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar.bz2 nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar.lz nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar.xz nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.tar.zst nixpkgs-4caa00594cba368f65e492742fe318e55dbb964f.zip | |
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")
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |