diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-25 14:58:26 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-25 14:58:26 +0100 |
commit | ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d (patch) | |
tree | aed000f532487264e1eb6cc27e9bee0879d5d4bf /pkgs/development | |
parent | 160fd7231ed57d9b5c1216d2b511478b80b08130 (diff) | |
download | nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar.gz nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar.bz2 nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar.lz nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar.xz nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.tar.zst nixlib-ddb608814a4d13fcbdc0f1dc5da71f2363a88d3d.zip |
libvirt: build with attr and apparmor
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libvirt-glib/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0018e38a9f95..8cebaeee2afd 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl , nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl -, xen +, xen, libapparmor }: let @@ -15,9 +15,11 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library for working with virtual machines"; longDescription = '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 2c5d6350315b..08a70b5514d3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2 +, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, xen, zfs }: @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline - gettext libtasn1 libgcrypt yajl + gettext libtasn1 libgcrypt yajl attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libcap_ng - libnl numad numactl xen zfs + libnl numad numactl xen zfs libapparmor ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { "--with-esx" "--with-remote" ] ++ optionals stdenv.isLinux [ + "--with-attr" + "--with-apparmor" + "--with-secdriver-apparmor" "--with-numad" "--with-macvtap" "--with-virtualport" |