about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/qemu
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-04-01 10:34:56 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2023-04-01 10:35:48 +0200
commit26495c833ffb8d9a72def3a890d15948b99d1872 (patch)
treed9a0222954388e8aee3e35c1e09ea5dc2a4ca4b4 /pkgs/applications/virtualization/qemu
parentcea8b33d31ed8ca361e6e9573f16b8d233fbc729 (diff)
qemu: fix build w/ glibc-2.37
Failing Hydra build: https://hydra.nixos.org/build/214419156
Relevant upstream thread: https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index c20a2c53d6002..7928181e3db16 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -117,6 +117,15 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E=";
       revert = true;
     })
+    # glibc >=2.37 compat, see https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a.patch";
+      sha256 = "sha256-1iWOWkLH0WP1Hk23fmrRVdX7YZWUXOvWRMTt8QM93BI=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e.patch";
+      sha256 = "sha256-DKGCbR+VDIFLp6FhER78gyJ3Rn1dD47pMtkcIIMd0B8=";
+    })
   ]
   ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;