From feb86343bd4227403b5793de5ed76015ff1bc341 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 3 Dec 2021 13:43:20 -0800 Subject: [PATCH] qemu: Add patch for socket_sockaddr_to_address_unix assertion errors See also: - http://bugs.debian.org/993145 - https://bugs.archlinux.org/task/72115 --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5c22b1649239..352c0c442d98 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -119,6 +119,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; }) + # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release. + (fetchpatch { + name = "fix-unix-socket-path-copy-again.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch"; + sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch