Merge pull request #68023 from ambrop72/phc-intel-assert-fix

phc-intel: Don't define the package if the assert would fail.
This commit is contained in:
Florian Klink 2019-09-04 06:36:10 -07:00 committed by GitHub
commit af2f81f227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15930,7 +15930,7 @@ in
perf = callPackage ../os-specific/linux/kernel/perf.nix { };
phc-intel = callPackage ../os-specific/linux/phc-intel { };
phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null;
# Disable for kernels 4.15 and above due to compatibility issues
prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null;