From c365b0d47b530827ba829ca140d8ecc36f0ff78a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 10 Oct 2022 22:53:17 +0200
Subject: [PATCH] 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.
---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index 8025ccd6db70..55c695d8dfd7 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -8,7 +8,7 @@
 , getopt
 , hivex
 , jansson
-, libguestfs
+, libguestfs-with-appliance
 , libvirt
 , libxml2
 , makeWrapper
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     hivex
     jansson
-    libguestfs
+    libguestfs-with-appliance
     libvirt
     libxml2
     ncurses
@@ -66,6 +66,10 @@ stdenv.mkDerivation rec {
     xz
   ];
 
+  makeFlags = [
+    "LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs"
+  ];
+
   enableParallelBuilding = true;
 
   preBuild = ''
@@ -74,7 +78,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     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; {