From 3d7d72bc46c0d2e8d4aa1f0016f7f3b97f0a210e Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Wed, 20 Nov 2019 12:57:51 +0300 Subject: [PATCH] virt-manager: use setupPyGlobalFlags --- .../virtualization/virt-manager/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 42860966fe1..83f7ff3fda1 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,10 +9,6 @@ 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.1"; @@ -49,13 +45,7 @@ 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 - ''; + setupPyGlobalFlags = [ "--no-update-icon-cache" ]; preFixup = '' gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")