From cdfc0b6429ed53bd4ff228a9fd8bfdff05905b96 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:19:28 +0300 Subject: [PATCH] virtmanager: fix librsvg propagation from wrapGAppsHook Custom buildPhase should be removed once there is support for setupPyDistFlags (not a final name). --- .../virtualization/virt-manager/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9011932a30b..249f5948dbb 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,6 +9,10 @@ with stdenv.lib; +# TODO: remove after there's support for setupPyDistFlags +let + setuppy = ../../../development/interpreters/python/run_setup.py; +in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; version = "2.2.0"; @@ -20,11 +24,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool file + intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; buildInputs = [ + wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 @@ -44,6 +49,14 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; + # TODO: remove after there's support for setupPyDistFlags + buildPhase = '' + runHook preBuild + cp ${setuppy} nix_run_setup + ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel + runHook postBuild + ''; + postInstall = '' ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas '';