From 940d545355d5e79859502334f2fe269c3996046b Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Mon, 14 Oct 2024 22:08:05 +0900 Subject: [PATCH] qemu-user: fix build under musl --- pkgs/applications/virtualization/qemu/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 619cc9daeba6..c5f1191605d9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -144,6 +144,16 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + + # musl changes https://gitlab.com/qemu-project/qemu/-/issues/2215 + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/ac1bbe8ca46c550b3ad99c85744119a3ace7b4f4.diff"; + sha256 = "sha256-wSlf8+7WHk2Z4I5cLFa37MRroQucPIuFzzyWnG9IpeY="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/99174ce39e86ec6aea7bb7ce326b16e3eed9e3da.diff"; + sha256 = "sha256-Cpt01d1ARoCTuJuC66no4doPgL+4/ZqnJTWwjU2MxnY="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;