public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55356 from lejonet/ceph-libvirt-qemu

Browse Source 
Add optional ceph support for libvirt and qemu
This commit is contained in:
Sarah Brofeldt 2019-02-06 21:21:19 +01:00 committed by GitHub
commit 1c10f5e395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/virtualization/qemu/default.nix
View File

@ -14,6 +14,7 @@
, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
, usbredirSupport ? spiceSupport, usbredir , usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen , xenSupport ? false, xen
, cephSupport ? false, ceph
, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer , virglSupport ? openGLSupport, virglrenderer
, smbdSupport ? false, samba , smbdSupport ? false, samba
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
++ optionals usbredirSupport [ usbredir ] ++ optionals usbredirSupport [ usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ] ++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ]
++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ] ++ optionals virglSupport [ virglrenderer ]
++ optionals smbdSupport [ samba ]; ++ optionals smbdSupport [ samba ];
@ -117,6 +119,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.isLinux "--enable-linux-aio" ++ optional stdenv.isLinux "--enable-linux-aio"
++ optional gtkSupport "--enable-gtk" ++ optional gtkSupport "--enable-gtk"
++ optional xenSupport "--enable-xen" ++ optional xenSupport "--enable-xen"
++ optional cephSupport "--enable-rbd"
++ optional openGLSupport "--enable-opengl" ++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer" ++ optional virglSupport "--enable-virglrenderer"
++ optional smbdSupport "--smbd=${samba}/bin/smbd"; ++ optional smbdSupport "--smbd=${samba}/bin/smbd";

5
pkgs/development/libraries/libvirt/default.nix
View File

@ -7,6 +7,7 @@
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
, enableXen ? false, xen ? null , enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi , enableIscsi ? false, openiscsi
, enableCeph ? false, ceph
}: }:
with stdenv.lib; with stdenv.lib;
@ -45,6 +46,8 @@ in stdenv.mkDerivation rec {
xen xen
] ++ optionals enableIscsi [ ] ++ optionals enableIscsi [
openiscsi openiscsi
] ++ optionals enableCeph [
ceph
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
@ -85,6 +88,8 @@ in stdenv.mkDerivation rec {
"--with-storage-zfs" "--with-storage-zfs"
] ++ optionals enableIscsi [ ] ++ optionals enableIscsi [
"--with-storage-iscsi" "--with-storage-iscsi"
] ++ optionals enableCeph [
"--with-storage-rbd"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"--with-init-script=none" "--with-init-script=none"
]; ];