diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-12-07 23:56:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-12-07 23:56:16 +0000 |
| commit | 16fb150e03627b03f02144bc995b0379e6641aaa (patch) | |
| tree | 07b45475f1c78106a06ff3c6ec7ad9cba1c0f90d /pkgs/applications/virtualization/qemu | |
| parent | dc2fcd9f02c2a520e9167f2b505f579d9edeba6a (diff) | |
| parent | feb86343bd4227403b5793de5ed76015ff1bc341 (diff) | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
pkgs/development/libraries/libunwind/default.nix
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c183196bed74..a77db7069f16 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 |