diff options
| author | Robin Gloster <mail@glob.in> | 2015-12-24 11:39:13 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2015-12-28 21:43:25 +0000 |
| commit | 8260022a1bf7c4a63b095ad96eeb36c1e7786c84 (patch) | |
| tree | 7bf63f41816472503294f93d7608e87a047ca808 /pkgs/development/libraries/libvirt-glib | |
| parent | 4e225b61d250100adcb46861788bef7d908baeeb (diff) | |
libvirt-glib: 0.2.0 -> 0.2.3
This also fixes the build with the xen-supporting libvirt and removes
obsolete workarounds.
Diffstat (limited to 'pkgs/development/libraries/libvirt-glib')
| -rw-r--r-- | pkgs/development/libraries/libvirt-glib/default.nix | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 39b053804726..ae83ce78d5fe 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,36 +1,21 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl , nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl +, xen }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.2.0"; + name = "libvirt-glib-0.2.3"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh"; + sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3"; }; buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng numactl + python pygobject gobjectIntrospection libcap_ng numactl xen ]; - # Compiler flag -fstack-protector-all fixes this build error: - # - # ./.libs/libvirt-glib-1.0.so: undefined reference to `__stack_chk_guard' - # - # And the extra include path fixes this build error: - # - # In file included from ../libvirt-gobject/libvirt-gobject-domain-device.h:30:0, - # from /tmp/nix-build-libvirt-glib-0.1.7.drv-2/libvirt-glib-0.1.7/libvirt-gobject/libvirt-gobject.h:33, - # from <stdin>:4: - # ../libvirt-gobject/libvirt-gobject-domain.h:33:29: fatal error: libvirt/libvirt.h: No such file or directory - # compilation terminated. - # make[3]: *** [LibvirtGObject-1.0.gir] Error 1 - preConfigure = '' - export NIX_CFLAGS_COMPILE="-fstack-protector-all -I${libvirt}/include" - ''; - meta = with stdenv.lib; { description = "Library for working with virtual machines"; longDescription = '' |