From c573e3eaa8717fbabab3f9a58bfed637fb441eac Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 19 Mar 2022 16:23:21 -0700 Subject: qemu: support running Linux 5.17 on aarch64-darwin --- pkgs/applications/virtualization/qemu/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/applications/virtualization') diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 2b183dd48d02..8f22e499d359 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -136,6 +136,15 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; }) + # The next two commits are to make Linux v5.17 work on aarch64-darwin. These are included in QEMU v7. + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/ad99f64f1cfff7c5e7af0e697523d9b7e45423b6.patch"; + sha256 = "sha256-e6WtfQIPEiXhWucd5ab7UIoccbWEAv3bwksn4hR85CY="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/7f6c295cdfeaa229c360cac9a36e4e595aa902ae.patch"; + sha256 = "sha256-mORtgfU1CYQFKO5UrXgM9cJyZxeF2bz8iAoq0UlFQeY="; + }) ./allow-virtfs-on-darwin.patch # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin # support on nix requires utimensat fallback. The patch adding this fallback -- cgit 1.4.1