about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorIvan Babrou <github@ivan.computer>2022-03-19 16:23:21 -0700
committerAlyssa Ross <hi@alyssa.is>2022-03-22 19:30:15 +0000
commitc573e3eaa8717fbabab3f9a58bfed637fb441eac (patch)
treeb0bb710e0a64500f80dd5f74fe07b66f54b13c84 /pkgs/applications/virtualization
parentb80ef5f981afaf24c10d684863d739e357388ec5 (diff)
downloadnixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar.gz
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar.bz2
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar.lz
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar.xz
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.tar.zst
nixlib-c573e3eaa8717fbabab3f9a58bfed637fb441eac.zip
qemu: support running Linux 5.17 on aarch64-darwin
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix9
1 files changed, 9 insertions, 0 deletions
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