diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-10 08:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 08:07:09 +0100 |
| commit | 425f1533e4ff66650f654d5db85f32ef4f17fc2d (patch) | |
| tree | 0a3367174c0b3921f44aa3089cf888566804457f | |
| parent | 2032339e5bbce8a57655b8742190ecb32b7af863 (diff) | |
| parent | dde3974afd1ed559aa720f8f74b2456be13c517e (diff) | |
| download | nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar.gz nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar.bz2 nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar.lz nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar.xz nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.tar.zst nixlib-425f1533e4ff66650f654d5db85f32ef4f17fc2d.zip | |
Merge pull request #108882 from tfmoraes/libguestfs_xen
libguestfs: remove xen as dependency
| -rw-r--r-- | pkgs/development/libraries/libguestfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
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 c460379c313c..c1c42beda0b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14431,8 +14431,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 { }; |