about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThiago Franco de Moraes <totonixsame@gmail.com>2021-01-09 16:51:33 -0300
committerThiago Franco de Moraes <totonixsame@gmail.com>2021-01-09 16:51:33 -0300
commitdde3974afd1ed559aa720f8f74b2456be13c517e (patch)
tree453b4cf83033e88a3d53cd2a05156bf78a7346e7
parent70d194c818fea9bc77d50f13f431f45cbcda7602 (diff)
downloadnixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar.gz
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar.bz2
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar.lz
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar.xz
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.tar.zst
nixlib-dde3974afd1ed559aa720f8f74b2456be13c517e.zip
libguestfs: remove xen as dependency
-rw-r--r--pkgs/development/libraries/libguestfs/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix9
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index b875b3579037..d6e45deadcf8 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
-, gmp, readline, file, numactl, xen, libapparmor, jansson
+, gmp, readline, file, numactl, libapparmor, jansson
 , getopt, perlPackages, ocamlPackages
 , libtirpc
 , appliance ? null
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ncurses cpio gperf jansson
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex db
-    numactl xen libapparmor getopt perlPackages.ModuleBuild
+    numactl libapparmor getopt perlPackages.ModuleBuild
     libtirpc
   ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
     ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c05b23df5793..9ad2d2881073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14429,8 +14429,13 @@ in
   libgudev = callPackage ../development/libraries/libgudev { };
 
   libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
-  libguestfs = callPackage ../development/libraries/libguestfs { };
-  libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; };
+  libguestfs = callPackage ../development/libraries/libguestfs {
+    autoreconfHook = buildPackages.autoreconfHook264;
+  };
+  libguestfs-with-appliance = libguestfs.override {
+    appliance = libguestfs-appliance;
+    autoreconfHook = buildPackages.autoreconfHook264;
+  };
 
 
   libhangul = callPackage ../development/libraries/libhangul { };