python3Packages.guestfs: build and use from pkgs.libguestfs

NixOS · Feb 27, 2025 · 8a9f97e · 8a9f97e
1 parent 2a36a34
commit 8a9f97e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 38 deletions.
diff --git a/pkgs/by-name/li/libguestfs/package.nix b/pkgs/by-name/li/libguestfs/package.nix
@@ -35,6 +35,7 @@
   jansson,
   getopt,
   perlPackages,
+  python3,
   ocamlPackages,
   libtirpc,
   appliance ? null,
@@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
       gperf
       makeWrapper
       pkg-config
+      python3
+      python3.pkgs.pycodestyle
       qemu
       zstd
     ]
@@ -103,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     numactl
     libapparmor
     perlPackages.ModuleBuild
+    python3
     libtirpc
     zstd
     ocamlPackages.ocamlbuild
@@ -120,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-install-daemon"
     "--disable-appliance"
     "--with-distro=NixOS"
+    "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
     "--with-readline"
     "CPPFLAGS=-I${lib.getDev libxml2}/include/libxml2"
     "INSTALL_OCAMLLIB=${placeholder "out"}/lib/ocaml"

diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -5774,9 +5774,7 @@ self: super: with self; {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  guestfs = callPackage ../development/python-modules/guestfs {
-    qemu = pkgs.qemu;
-  };
+  guestfs = toPythonModule pkgs.libguestfs;
 
   gudhi = callPackage ../development/python-modules/gudhi {
     inherit (pkgs) cgal;