diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/development/libraries/libvirt/default.nix | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/libvirt/default.nix')
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 642baba4376..224168888c0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils -, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext +, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 util-linux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen |