libguestfs: 1.44.1 → 1.46.2
This commit is contained in:
parent
08b16191a9
commit
59b1fab580
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, makeWrapper
|
||||
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
|
||||
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
|
||||
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2
|
||||
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
|
||||
, gmp, readline, file, numactl, libapparmor, jansson
|
||||
, getopt, perlPackages, ocamlPackages
|
||||
|
@ -12,11 +12,11 @@ assert javaSupport -> jdk != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libguestfs";
|
||||
version = "1.44.1";
|
||||
version = "1.46.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
|
||||
sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj";
|
||||
sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
++ (with ocamlPackages; [ ocaml findlib ]);
|
||||
buildInputs = [
|
||||
ncurses jansson
|
||||
pcre augeas libxml2 acl libcap libcap_ng libconfig
|
||||
pcre2 augeas libxml2 acl libcap libcap_ng libconfig
|
||||
systemd fuse yajl libvirt gmp readline file hivex db
|
||||
numactl libapparmor perlPackages.ModuleBuild
|
||||
libtirpc
|
||||
|
@ -53,13 +53,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals (!javaSupport) [ "--without-java" ];
|
||||
patches = [
|
||||
./libguestfs-syms.patch
|
||||
# Set HAVE_RPM, HAVE_DPKG, HAVE_PACMAN
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libguestfs/libguestfs/commit/210959cc344d6a4a1e3afa26d276b130651def74.patch";
|
||||
sha256 = "121l58mk2mwhhqc3rcisdw3di7y729b30hyffc8a50mq5k7fvsdb";
|
||||
})
|
||||
];
|
||||
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
|
||||
installFlags = [ "REALLY_INSTALL=yes" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue