mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Merge pull request #146036 from jmgao/qemu_io_uring
This commit is contained in:
commit
11952924f1
@ -23,6 +23,7 @@
|
|||||||
, libiscsiSupport ? true, libiscsi
|
, libiscsiSupport ? true, libiscsi
|
||||||
, smbdSupport ? false, samba
|
, smbdSupport ? false, samba
|
||||||
, tpmSupport ? true
|
, tpmSupport ? true
|
||||||
|
, uringSupport ? stdenv.isLinux, liburing
|
||||||
, hostCpuOnly ? false
|
, hostCpuOnly ? false
|
||||||
, hostCpuTargets ? (if hostCpuOnly
|
, hostCpuTargets ? (if hostCpuOnly
|
||||||
then (lib.optional stdenv.isx86_64 "i386-softmmu"
|
then (lib.optional stdenv.isx86_64 "i386-softmmu"
|
||||||
@ -77,7 +78,8 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optionals openGLSupport [ mesa epoxy libdrm ]
|
++ lib.optionals openGLSupport [ mesa epoxy libdrm ]
|
||||||
++ lib.optionals virglSupport [ virglrenderer ]
|
++ lib.optionals virglSupport [ virglrenderer ]
|
||||||
++ lib.optionals libiscsiSupport [ libiscsi ]
|
++ 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
|
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 virglSupport "--enable-virglrenderer"
|
||||||
++ lib.optional tpmSupport "--enable-tpm"
|
++ lib.optional tpmSupport "--enable-tpm"
|
||||||
++ lib.optional libiscsiSupport "--enable-libiscsi"
|
++ 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
|
doCheck = false; # tries to access /dev
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user