MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gnome-boxes, libguestfs: fix builds due to libvirt

Browse source 
Adds link time dependencies which are now used in libvirt and unbreaks
these packages
This commit is contained in:
Robin Gloster 2015-12-24 23:16:59 +00:00
parent 0bd5a83403
commit 8eede9e41e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
View file

@ -2,8 +2,8 @@
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
, desktop_file_utils, mtools, cdrkit, libcdio , desktop_file_utils, mtools, cdrkit, libcdio, libgudev
, libusb, libarchive, acl , libusb, libarchive, acl, xen, numactl
}: }:
# TODO: ovirt (optional) # TODO: ovirt (optional)
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
librsvg desktop_file_utils acl librsvg desktop_file_utils acl libgudev xen numactl
]; ];
preFixup = '' preFixup = ''

6
pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
View file

@ -2,8 +2,8 @@
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
, desktop_file_utils, mtools, cdrkit, libcdio , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
, libusb, libarchive, acl , libusb, libarchive, acl, libgudev
}: }:
# TODO: ovirt (optional) # TODO: ovirt (optional)
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
librsvg desktop_file_utils acl librsvg desktop_file_utils acl libgudev numactl xen
]; ];
preFixup = '' preFixup = ''

4
pkgs/development/libraries/libguestfs/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , 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 { stdenv.mkDerivation rec {
name = "libguestfs-${version}"; name = "libguestfs-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
SysVirt SysVirt numactl xen
]; ];
configureFlags = "--disable-appliance --disable-daemon"; configureFlags = "--disable-appliance --disable-daemon";