From 3d7d72bc46c0d2e8d4aa1f0016f7f3b97f0a210e Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Wed, 20 Nov 2019 12:57:51 +0300 Subject: [PATCH 1/3] 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") From 0072e70d3501ad8386cdc64300446daf2d94fcc7 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Thu, 21 Nov 2019 14:27:59 +0300 Subject: [PATCH 2/3] virt-manager: remove redundant namePrefix assignment buildPythonApplication does namePrefix = "" --- pkgs/applications/virtualization/virt-manager/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 83f7ff3fda1..04419ce6c47 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -12,7 +12,6 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; version = "2.2.1"; - namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; From 22a050ff5edbaf321c6d654b7b093593aaff3196 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Thu, 21 Nov 2019 14:30:20 +0300 Subject: [PATCH 3/3] virt-manager: use pname --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 04419ce6c47..99d20477a12 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { - name = "virt-manager-${version}"; + pname = "virt-manager"; version = "2.2.1"; src = fetchurl { - url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; + url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz"; sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; };