diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-11-24 00:07:08 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-11-25 19:47:56 +0000 |
| commit | 5d9e0f86b9883ab309acaa6607a9dc0e7372ad2b (patch) | |
| tree | ad1182183cd9dabd618757b07fd0154891d62d99 /pkgs/applications/virtualization | |
| parent | 0b12f0c1c93664bcf82a95e4746446cbf7d5a27c (diff) | |
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.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8a18692b9ee1..4919f95b5a662 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" |