summary refs log tree commit diff
diff options
context:
space:
mode:
authorZhaofeng Li <hello@zhaofeng.li>2021-12-03 13:43:20 -0800
committerAlyssa Ross <hi@alyssa.is>2021-12-07 23:46:26 +0000
commitfeb86343bd4227403b5793de5ed76015ff1bc341 (patch)
tree1b8c73fccd70f66bf5b79bc8a27c4700739c0067
parent0cce1fedbedc87f2dcd5a7db5b197cdecfe630b1 (diff)
downloadnixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar.gz
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar.bz2
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar.lz
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar.xz
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.tar.zst
nixpkgs-feb86343bd4227403b5793de5ed76015ff1bc341.zip
qemu: Add patch for socket_sockaddr_to_address_unix assertion errors
See also:
- http://bugs.debian.org/993145
- https://bugs.archlinux.org/task/72115
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5c22b164923..352c0c442d9 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