From 27e3c0da4437131f3c01d2b82ecb98d9046b0997 Mon Sep 17 00:00:00 2001 From: David Gonzalez Martin Date: Wed, 17 May 2023 23:55:04 +0200 Subject: [PATCH] qemu: add capstone support Currently using the -d in_asm flag in QEMU does not report any dissassembly. This fixes it. --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0761d58c7265..b4288cb7d7b5 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -27,6 +27,7 @@ , tpmSupport ? true , uringSupport ? stdenv.isLinux, liburing , canokeySupport ? false, canokey-qemu +, capstoneSupport ? true, capstone , enableDocs ? true , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ] ++ lib.optionals uringSupport [ liburing ] - ++ lib.optionals canokeySupport [ canokey-qemu ]; + ++ lib.optionals canokeySupport [ canokey-qemu ] + ++ lib.optionals capstoneSupport [ capstone ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -175,7 +177,8 @@ stdenv.mkDerivation rec { ++ lib.optional libiscsiSupport "--enable-libiscsi" ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" ++ lib.optional uringSupport "--enable-linux-io-uring" - ++ lib.optional canokeySupport "--enable-canokey"; + ++ lib.optional canokeySupport "--enable-canokey" + ++ lib.optional capstoneSupport "--enable-capstone"; dontWrapGApps = true;