diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
| commit | 5487bcdfdd2c750274761263f3d65c00d7f6897b (patch) | |
| tree | 6584bf52d6b70a59e10cd8eef51280f42ad2afa8 /pkgs/applications/virtualization/virt-manager/default.nix | |
| parent | 8b9edf1e0fa01a9de7db6ead1b7b28f23b91b3e2 (diff) | |
| parent | 1623d81e507520b5207307bc2bf8cfcddf90944a (diff) | |
| download | nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.gz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.bz2 nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.lz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.xz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.zst nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.zip | |
Rebase onto 236cc2971ac72acd90f0ae3a797f9f83098b17ec
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/applications/virtualization/virt-manager/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 18 |
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 99299ce31f9..272e10318ef 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[@]}") ''; |