diff options
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/driver/win-spice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 10668afd7eb43..9bbbe640148de 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation { # SPICE needs vioserial # TODO: Link windows version in win-spice (here) to version used in win-virtio. # That way it would never matter whether vioserial is installed from win-virtio or win-spice. - copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n"; - copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch); + copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; + copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version); in '' runHook preInstall ${(copy "amd64" "w10") + (copy "x86" "w10")} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0761d58c7265c..b4288cb7d7b5d 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; |