diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-05-17 18:26:39 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-08-10 02:27:53 +0900 |
| commit | 4e30a2852cf8b80ed9e22ffbeff75320446edd72 (patch) | |
| tree | 28d38091484527c191790902cfdc6eba73d6cb28 /pkgs/os-specific | |
| parent | 2da1ad60a8ccc2946cfb6f547453ce2387a06bae (diff) | |
| download | nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar.gz nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar.bz2 nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar.lz nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar.xz nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.tar.zst nixpkgs-4e30a2852cf8b80ed9e22ffbeff75320446edd72.zip | |
Addressing review
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/blcr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/prl-tools/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 626e978f1f1..e018f4622b4 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -2,7 +2,7 @@ # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x -assert builtins.compareVersions "3.18" kernel.version == 1; +assert stdenv.lib.versionOlder "3.18" kernel.version; stdenv.mkDerivation { name = "blcr_${kernel.version}-0.8.6pre4"; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9edf924b32f..1a4919a5d9d 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -5,6 +5,8 @@ }: assert (!libsOnly) -> kernel != null; +# Disable for kernels 4.15 and above due to compatibility issues +assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15"; let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); |