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

libvirt: remove xen dependency on aarch64

Browse Source
This commit is contained in:
John Doe 2017-12-06 10:55:39 +00:00 committed by Tuomas Tynkkynen
parent 73b65551f4
commit 750a7c677b
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -25,8 +25,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
libcap_ng numactl libapparmor xen libcap_ng numactl libapparmor
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; ] ++ optionals stdenv.isx86_64 [
xen
] ++ optionals spiceSupport [
spice_gtk spice_protocol libcap gdbm
];
postInstall = '' postInstall = ''
for f in "$out"/bin/*; do for f in "$out"/bin/*; do

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

@ -16,7 +16,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor
] ++ stdenv.lib.optionals stdenv.isx86_64 [
xen
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
libxslt xhtml1 perlPackages.XMLXPath curl libpcap libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ 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 attr parted libapparmor libcap_ng numactl attr parted
] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [
xen
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv gmp libiconv gmp
]; ];