From 4f7aef8788de3e43794178db5a44ad0255c08bf1 Mon Sep 17 00:00:00 2001
From: Astro <sm@m-labs.hk>
Date: Tue, 11 Oct 2022 00:10:58 +0200
Subject: [PATCH] wfvm/win: replace libguestfs with guestfs-tools

tools like virt-make-fs have been split off into a separate package.
---
 flake.nix    | 2 ++
 wfvm/win.nix | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 47d5d54..c197975 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,8 @@
   description = "WFVM: Windows Functional Virtual Machine";
 
   inputs = {
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:astro/nixpkgs/guestfs-tools";
   };
 
   outputs = { self, nixpkgs }:
diff --git a/wfvm/win.nix b/wfvm/win.nix
index 820e669..091da95 100644
--- a/wfvm/win.nix
+++ b/wfvm/win.nix
@@ -14,7 +14,7 @@
 let
   lib = pkgs.lib;
   utils = import ./utils.nix { inherit pkgs efi; };
-  libguestfs = pkgs.libguestfs-with-appliance;
+  inherit (pkgs) guestfs-tools;
 
   # p7zip on >20.03 has known vulns but we have no better option
   p7zip = pkgs.p7zip.overrideAttrs(old: {
@@ -24,7 +24,7 @@ let
   });
 
   runQemuCommand = name: command: (
-    pkgs.runCommand name { buildInputs = [ p7zip utils.qemu libguestfs ]; }
+    pkgs.runCommand name { buildInputs = [ p7zip utils.qemu guestfs-tools ]; }
       (
         ''
           if ! test -f; then
@@ -109,7 +109,7 @@ let
       ''
         #!${pkgs.runtimeShell}
         set -euxo pipefail
-        export PATH=${lib.makeBinPath [ p7zip utils.qemu libguestfs pkgs.wimlib ]}:$PATH
+        export PATH=${lib.makeBinPath [ p7zip utils.qemu guestfs-tools pkgs.wimlib ]}:$PATH
 
         # Create a bootable "USB" image
         # Booting in USB mode circumvents the "press any key to boot from cdrom" prompt