From 84fd85863388fbd51aa0753dd4848fc21d1ed616 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 25 May 2021 15:36:40 -0300 Subject: [PATCH 1/2] virt-manager: fix missing cdrtools (cherry picked from commit 13f3200cd056e44886f063e8d785460b172523df) --- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4d74b5d6610..2bdfcb3d11e 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ - pygobject3 ipaddress libvirt libxml2 requests + pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; patchPhase = '' From b08b7cd9b743b9467fc5ea4ecd3e8176e4d30d05 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 29 May 2021 02:30:53 +0200 Subject: [PATCH 2/2] Apply suggestions from code review (cherry picked from commit 902ce1df42adc35ca871c5b7c00d0b6dad145749) --- pkgs/applications/virtualization/virt-manager/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 2bdfcb3d11e..1d5044cd213 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -32,10 +32,9 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; - [ - pygobject3 ipaddress libvirt libxml2 requests cdrtools - ]; + propagatedBuildInputs = with python3Packages; [ + pygobject3 ipaddress libvirt libxml2 requests cdrtools + ]; patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py