guestfs-tools: use libguestfs-with-appliance

Fixes "cannot find any suitable libguestfs supermin, fixed or old-style
appliance on LIBGUESTFS_PATH" when running virt-make-fs.
This commit is contained in:
Astro 2022-10-10 22:53:17 +02:00
parent f77a8a1df0
commit c365b0d47b

View file

@ -8,7 +8,7 @@
, getopt , getopt
, hivex , hivex
, jansson , jansson
, libguestfs , libguestfs-with-appliance
, libvirt , libvirt
, libxml2 , libxml2
, makeWrapper , makeWrapper
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
hivex hivex
jansson jansson
libguestfs libguestfs-with-appliance
libvirt libvirt
libxml2 libxml2
ncurses ncurses
@ -66,6 +66,10 @@ stdenv.mkDerivation rec {
xz xz
]; ];
makeFlags = [
"LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs"
];
enableParallelBuilding = true; enableParallelBuilding = true;
preBuild = '' preBuild = ''
@ -74,7 +78,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/virt-win-reg \ wrapProgram $out/bin/virt-win-reg \
--prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs ]} --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
''; '';
meta = with lib; { meta = with lib; {