public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108882 from tfmoraes/libguestfs_xen

Browse Source 
libguestfs: remove xen as dependency
This commit is contained in:
Sandro 2021-01-10 08:07:09 +01:00 committed by GitHub
commit 425f1533e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , 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 , getopt, perlPackages, ocamlPackages
, libtirpc , libtirpc
, appliance ? null , appliance ? null
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
ncurses cpio gperf jansson ncurses cpio gperf jansson
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 db systemd fuse yajl libvirt gmp readline file hivex db
numactl xen libapparmor getopt perlPackages.ModuleBuild numactl libapparmor getopt perlPackages.ModuleBuild
libtirpc libtirpc
] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])

9
pkgs/top-level/all-packages.nix
View File

@ -14431,8 +14431,13 @@ in
libgudev = callPackage ../development/libraries/libgudev { }; libgudev = callPackage ../development/libraries/libgudev { };
libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
libguestfs = callPackage ../development/libraries/libguestfs { }; libguestfs = callPackage ../development/libraries/libguestfs {
libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; }; autoreconfHook = buildPackages.autoreconfHook264;
};
libguestfs-with-appliance = libguestfs.override {
appliance = libguestfs-appliance;
autoreconfHook = buildPackages.autoreconfHook264;
};
libhangul = callPackage ../development/libraries/libhangul { }; libhangul = callPackage ../development/libraries/libhangul { };