From 8eede9e41ecdd18b93388fb044eef445eb19ada3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 23:16:59 +0000
Subject: [PATCH] gnome-boxes, libguestfs: fix builds due to libvirt

Adds link time dependencies which are now used in libvirt and unbreaks
these packages
---
 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix | 6 +++---
 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 6 +++---
 pkgs/development/libraries/libguestfs/default.nix       | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
index 10eaa34a8a2b..2c670b00f8ab 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -2,8 +2,8 @@
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio
-, libusb, libarchive, acl
+, desktop_file_utils, mtools, cdrkit, libcdio, libgudev
+, libusb, libarchive, acl, xen, numactl
 }:
 
 # TODO: ovirt (optional)
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
     gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl
+    librsvg desktop_file_utils acl libgudev xen numactl
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
index 90955bd3ccf9..6f5af374dbc4 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
@@ -2,8 +2,8 @@
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio
-, libusb, libarchive, acl
+, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
+, libusb, libarchive, acl, libgudev
 }:
 
 # TODO: ovirt (optional)
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
     gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl
+    librsvg desktop_file_utils acl libgudev numactl xen
   ];
 
   preFixup = ''
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index fb988db65d1a..003c1cf3432c 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt
+    SysVirt numactl xen
   ];
 
   configureFlags = "--disable-appliance --disable-daemon";