diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-15 18:01:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 18:01:43 +0000 |
| commit | cfaff97318c7e837697fe30dcd7d542829b3f11c (patch) | |
| tree | 24ee00288549cf89b351aa0ff329903beebd0e59 /pkgs/applications/virtualization | |
| parent | f16721775ee53a355733d9e18233234f6620070c (diff) | |
| parent | b0228686751ade20abc10a66e5615f0b99deb215 (diff) | |
| download | nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar.gz nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar.bz2 nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar.lz nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar.xz nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.tar.zst nixpkgs-cfaff97318c7e837697fe30dcd7d542829b3f11c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b95979fe88c..9d2b227dcbb 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -23,6 +23,7 @@ , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true +, uringSupport ? stdenv.isLinux, liburing , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -77,7 +78,8 @@ stdenv.mkDerivation rec { ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] - ++ lib.optionals smbdSupport [ samba ]; + ++ lib.optionals smbdSupport [ samba ] + ++ lib.optionals uringSupport [ liburing ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -187,7 +189,8 @@ stdenv.mkDerivation rec { ++ lib.optional virglSupport "--enable-virglrenderer" ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" - ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"; + ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" + ++ lib.optional uringSupport "--enable-linux-io-uring"; doCheck = false; # tries to access /dev dontWrapGApps = true; |