diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-22 06:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 06:01:10 +0000 |
| commit | cbcbfb490198385bc119c152e7a4cf58b6c49ec2 (patch) | |
| tree | a752073e7df2e4d23e9c0c32dad578d7c11b6d2f /pkgs/applications/virtualization/qemu | |
| parent | 2f9a2c9dfeae6c11773f88a64a8b7f501e5a9a89 (diff) | |
| parent | 726f7c9688bad4574abee4f47565bf272daf8f81 (diff) | |
| download | nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.gz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.bz2 nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.lz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.xz nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.tar.zst nixpkgs-cbcbfb490198385bc119c152e7a4cf58b6c49ec2.zip | |
Merge master into staging-next
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 9d2b227dcbb..a8a18692b9e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -112,6 +112,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; }) + # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. + (fetchpatch { + name = "qxl-fix-pre-save-logic.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; + sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch |