diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-15 17:33:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 17:33:17 +0200 |
| commit | 11952924f1932f7a8a3ed4e4d6dd921b5bf62aef (patch) | |
| tree | 6a4557ab8e3ec74f68db0e7ecaae0c4c377e13c7 /pkgs/applications/virtualization | |
| parent | 4e7dda04ccc1e93658abcfafcd4a911bc093336e (diff) | |
| parent | 3f772a5f2baff61a263895c213fd7bf9819f0265 (diff) | |
| download | nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar.gz nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar.bz2 nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar.lz nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar.xz nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.tar.zst nixpkgs-11952924f1932f7a8a3ed4e4d6dd921b5bf62aef.zip | |
Merge pull request #146036 from jmgao/qemu_io_uring
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 477b1603d27..c230fac1e61 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 epoxy 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; |