diff options
author | John Doe <John Doe john@example.com> | 2017-12-06 10:55:39 +0000 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-11 19:46:05 +0200 |
commit | 750a7c677b99806dbe560d5a8c6628ddd5de2d8c (patch) | |
tree | 39c3ebc395c1d46118af5853454ce7606c377216 /pkgs | |
parent | 73b65551f4d084d8cf29438b5093d4da806e92c0 (diff) | |
download | nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar.gz nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar.bz2 nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar.lz nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar.xz nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.tar.zst nixlib-750a7c677b99806dbe560d5a8c6628ddd5de2d8c.zip |
libvirt: remove xen dependency on aarch64
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt-glib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3b8d0a7cf63e..68ee06953a38 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib - libcap_ng numactl libapparmor xen - ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + libcap_ng numactl libapparmor + ] ++ optionals stdenv.isx86_64 [ + xen + ] ++ optionals spiceSupport [ + spice_gtk spice_protocol libcap gdbm + ]; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index e41ab5fe5a33..83b2983d9c4b 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -16,7 +16,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ 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; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f2710435c00c..754588504160 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -27,9 +27,11 @@ stdenv.mkDerivation rec { libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals stdenv.isLinux [ 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 [ - libiconv gmp + libiconv gmp ]; preConfigure = optionalString stdenv.isLinux '' |