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 1/4] 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; {

From fd7f6be003960f6c0b624cd553d6802a0df716da Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 10 Oct 2022 22:55:18 +0200
Subject: [PATCH 2/4] guestfs-tools: patch less shebangs

---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index 55c695d8dfd7..d564cae9afd5 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -66,16 +66,16 @@ stdenv.mkDerivation rec {
     xz
   ];
 
+  preConfigure = ''
+    patchShebangs ocaml-dep.sh.in ocaml-link.sh.in run.in
+  '';
+
   makeFlags = [
     "LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs"
   ];
 
   enableParallelBuilding = true;
 
-  preBuild = ''
-    patchShebangs .
-  '';
-
   postInstall = ''
     wrapProgram $out/bin/virt-win-reg \
       --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}

From 960cc8f3f1b4a71ca67d8a8d55ba6f0c9058ab8c Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 10 Oct 2022 22:56:04 +0200
Subject: [PATCH 3/4] guestfs-tools: install bash-completion scripts

---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index d564cae9afd5..979dbc6dee86 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, bash-completion
 , bison
 , cdrkit
 , cpio
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
   ]);
 
   buildInputs = [
+    bash-completion
     hivex
     jansson
     libguestfs-with-appliance
@@ -74,6 +76,10 @@ stdenv.mkDerivation rec {
     "LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs"
   ];
 
+  installFlags = [
+    "BASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completion/completions"
+  ];
+
   enableParallelBuilding = true;
 
   postInstall = ''

From 4886f37b9710c77cb9c988799f7eddbde5afb25e Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 10 Oct 2022 22:56:43 +0200
Subject: [PATCH 4/4] guestfs-tools: add optional dependency openssl

---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index 979dbc6dee86..446d4bcde0b7 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -15,6 +15,7 @@
 , makeWrapper
 , ncurses
 , ocamlPackages
+, openssl
 , pcre2
 , perlPackages
 , pkg-config
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
     libvirt
     libxml2
     ncurses
+    openssl
     pcre2
     xz
   ];