b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sandro Jäckel 2022-05-30 06:06:35 +02:00
parent 3d6c93dd79
commit d060e634e8
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/virtualization/virt-manager/default.nix
View file

@ -5,8 +5,6 @@
, spiceSupport ? true, spice-gtk ? null , spiceSupport ? true, spice-gtk ? null
}: }:
with lib;
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "virt-manager"; pname = "virt-manager";
version = "4.0.0"; version = "4.0.0";
@ -29,17 +27,12 @@ python3.pkgs.buildPythonApplication rec {
libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
gsettings-desktop-schemas libosinfo gtksourceview4 gsettings-desktop-schemas libosinfo gtksourceview4
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 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; [ 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 = [ patches = [
# due to a recent change in setuptools-61, "packages=[]" needs to be included # 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 # 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 = '' postConfigure = ''
${python3.interpreter} setup.py configure --prefix=$out ${python3.interpreter} setup.py configure --prefix=$out
''; '';
@ -63,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
# these are called from virt-install in initrdinject.py # 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[@]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';