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

Merge pull request #24822 from techhazard/add-disk-storage-to-libvirt

Browse Source 
add disk type storage to libvirt
This commit is contained in:
Benjamin Staffin 2017-04-14 19:12:33 -04:00 committed by GitHub
commit cdbcaa56b6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen, zfs , curl, libiconv, gmp, xen, zfs, parted
}: }:
with stdenv.lib; with stdenv.lib;
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl xen libapparmor libcap_ng numactl xen
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
"--with-test" "--with-test"
"--with-esx" "--with-esx"
"--with-remote" "--with-remote"
"--with-storage-disk"
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
"--with-attr" "--with-attr"
"--with-apparmor" "--with-apparmor"