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

phc-intel: Don't define the package if the assert would fail.
2019-09-04 06:36:10 -07:00
parent 29e4048d0a 97a2ef37c0
commit af2f81f227
1 changed files with 1 additions and 1 deletions
@@ -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;