From 5d9e0f86b9883ab309acaa6607a9dc0e7372ad2b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Nov 2021 00:07:08 +0000 Subject: [PATCH] qemu: never use bundled Meson It's better to fail to build if our version of Meson isn't compatible with QEMU's, so we'll know something is wrong. Otherwise, we'll get subtle breakages that only manifest at runtime, which I think might be what happened in 9e403b19a14 ("qemu: 5.1.0 -> 5.2.0") to necessitate autoPatchelfHook. --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8a18692b9ee..4919f95b5a66 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -178,6 +178,9 @@ stdenv.mkDerivation rec { "--enable-guest-agent" "--localstatedir=/var" "--sysconfdir=/etc" + # Always use our Meson, not the bundled version, which doesn't + # have our patches and will be subtly broken because of that. + "--meson=meson" ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" ++ lib.optional smartcardSupport "--enable-smartcard"