Merge pull request #73813 from aske/virt-man-flags

virt-manager: use setupPyGlobalFlags
This commit is contained in:
Frederik Rietdijk 2019-11-28 15:14:06 +01:00 committed by GitHub
commit 072f9fe290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,17 +9,12 @@
with stdenv.lib; with stdenv.lib;
# TODO: remove after there's support for setupPyDistFlags
let
setuppy = ../../../development/interpreters/python/run_setup.py;
in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "virt-manager-${version}"; pname = "virt-manager";
version = "2.2.1"; version = "2.2.1";
namePrefix = "";
src = fetchurl { 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"; sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g";
}; };
@ -49,13 +44,7 @@ python3Packages.buildPythonApplication rec {
${python3Packages.python.interpreter} setup.py configure --prefix=$out ${python3Packages.python.interpreter} setup.py configure --prefix=$out
''; '';
# TODO: remove after there's support for setupPyDistFlags setupPyGlobalFlags = [ "--no-update-icon-cache" ];
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
'';
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")