virt-manager: remove with over entire scope, do manually patching in postPatch, remove backport ipaddress

1 files changed, 8 insertions, 10 deletions

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 99299ce31f9f5..272e10318ef6a 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -5,8 +5,6 @@
 , spiceSupport ? true, spice-gtk ? null
 }:
 
-with lib;
-
 python3.pkgs.buildPythonApplication rec {
   pname = "virt-manager";
   version = "4.0.0";
@@ -29,17 +27,12 @@ python3.pkgs.buildPythonApplication rec {
     libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
     gsettings-desktop-schemas libosinfo gtksourceview4
     gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
-  ] ++ optional spiceSupport spice-gtk;
+  ] ++ lib.optional spiceSupport spice-gtk;
 
   propagatedBuildInputs = with python3.pkgs; [
-    pygobject3 ipaddress libvirt libxml2 requests cdrtools
+    pygobject3 libvirt libxml2 requests cdrtools
   ];
 
-  prePatch = ''
-    sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
-    sed -i "/'install_egg_info'/d" setup.py
-  '';
-
    patches = [
      # due to a recent change in setuptools-61, "packages=[]" needs to be included
      # this patch can hopefully be removed, once virt-manager has an upstream version bump
@@ -50,6 +43,11 @@ python3.pkgs.buildPythonApplication rec {
     })
   ];
 
+  postPatch = ''
+    sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
+    sed -i "/'install_egg_info'/d" setup.py
+  '';
+
   postConfigure = ''
     ${python3.interpreter} setup.py configure --prefix=$out
   '';
@@ -63,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
 
     gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
     # these are called from virt-install in initrdinject.py
-    gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
 
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';