diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 86cf5352d6b..301a9211cf6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -14,6 +14,7 @@ , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen +, cephSupport ? false, ceph , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] + ++ optionals cephSupport [ ceph ] ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; @@ -117,6 +119,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" + ++ optional cephSupport "--enable-rbd" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9f183365aae..85b8b128d20 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -7,6 +7,7 @@ , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi +, enableCeph ? false, ceph }: with stdenv.lib; @@ -45,6 +46,8 @@ in stdenv.mkDerivation rec { xen ] ++ optionals enableIscsi [ openiscsi + ] ++ optionals enableCeph [ + ceph ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -85,6 +88,8 @@ in stdenv.mkDerivation rec { "--with-storage-zfs" ] ++ optionals enableIscsi [ "--with-storage-iscsi" + ] ++ optionals enableCeph [ + "--with-storage-rbd" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ];