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

libvirt: build with attr and apparmor

Browse Source
This commit is contained in:
Franz Pletz 2017-03-25 14:58:26 +01:00
parent 160fd7231e
commit ddb608814a
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libvirt-glib/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl , nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
, xen , xen, libapparmor
}: }:
let let
@ -15,9 +15,11 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt 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; { meta = with stdenv.lib; {
description = "Library for working with virtual machines"; description = "Library for working with virtual machines";
longDescription = '' longDescription = ''

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl, fetchpatch
, pkgconfig, makeWrapper , pkgconfig, makeWrapper
, libxml2, gnutls, devicemapper, perl, python2 , libxml2, gnutls, devicemapper, perl, python2, attr
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , 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 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen, zfs , curl, libiconv, gmp, xen, zfs
}: }:
@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ buildInputs = [
libxml2 gnutls perl python2 readline libxml2 gnutls perl python2 readline
gettext libtasn1 libgcrypt yajl gettext libtasn1 libgcrypt yajl attr
libxslt xhtml1 perlPackages.XMLXPath curl libpcap libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libcap_ng libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
libnl numad numactl xen zfs libnl numad numactl xen zfs libapparmor
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];
@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
"--with-esx" "--with-esx"
"--with-remote" "--with-remote"
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
"--with-attr"
"--with-apparmor"
"--with-secdriver-apparmor"
"--with-numad" "--with-numad"
"--with-macvtap" "--with-macvtap"
"--with-virtualport" "--with-virtualport"