summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBabbaj <babbaj45@gmail.com>2022-05-31 17:53:46 -0400
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-05-31 23:20:26 +0000
commit41b2e03621e5b54b0f1fd1812836cfabfb211ec0 (patch)
tree344ac34245dd03e16313569bff854bc450097498
parentMerge pull request #175645 from NixOS/backport-175546-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-175651-to-release-22.05.tar.gz
linuxPackages.kvmfr: fix for linux 5.18origin/backport-175651-to-release-22.05
(cherry picked from commit 0835ac53cfc7387ef8de43bafc36ede6f61461a9)
-rw-r--r--pkgs/os-specific/linux/kvmfr/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix
index 4bb20a9b62ae..24fedbf59d78 100644
--- a/pkgs/os-specific/linux/kvmfr/default.nix
+++ b/pkgs/os-specific/linux/kvmfr/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch";
sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx";
stripLen = 1;
+ })
+ ++ lib.optional (kernel.kernelAtLeast "5.18") (fetchpatch {
+ name = "kvmfr-5.18.patch";
+ url = "https://github.com/gnif/LookingGlass/commit/c7029f95042fe902843cb6acbfc75889e93dc210.patch";
+ sha256 = "sha256-6DpL17XWj8BKpiBdKdCPC51MWKLIo6PixQ9UaygT2Zg=";
+ stripLen = 1;
});
makeFlags = [
@@ -35,6 +41,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ j-brn ];
platforms = [ "x86_64-linux" ];
- broken = kernel.kernelOlder "5.3" && kernel.kernelAtLeast "5.18";
+ broken = kernel.kernelOlder "5.3";
};
}