diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/libvirt | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvirt')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libvirt/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index ea4b40c3c891..28b67a801989 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph +, enableGlusterfs ? false, glusterfs }: with lib; @@ -72,6 +73,8 @@ in stdenv.mkDerivation rec { openiscsi ] ++ optionals enableCeph [ ceph + ] ++ optionals enableGlusterfs [ + glusterfs ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -119,6 +122,7 @@ in stdenv.mkDerivation rec { "-Dsecdriver_apparmor=enabled" "-Dnumad=enabled" "-Dstorage_disk=enabled" + (opt "glusterfs" enableGlusterfs) (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ "-Dinit_script=none" |