From b0bffdd36fc2356c9c2225f538bde65511dc06ad Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 8 Jun 2022 20:07:15 +0400 Subject: [PATCH] qemu: Add patch to fix 9p support on Darwin This patch fixes issues with error codes on Darwin host and Linux guest. It has landed in QEMU master, so should be included in the next release. Related to #108984. --- pkgs/applications/virtualization/qemu/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a481b50f3e16..fb41e303f537 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -115,8 +115,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; }) + # fix 9p on macOS host, landed in master + (fetchpatch { + name = "fix-9p-on-macos.patch"; + url = "https://gitlab.com/qemu/qemu/-/commit/f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65.patch"; + sha256 = "sha256-8i13wU135h+YxoXFtkXweBN3hMslpWoNoeQ7Ydmn3V4="; + }) ] - ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; + ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists.