From 9f7c464ec39ca2882098e19c9021186fd9945e47 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 Aug 2022 20:26:19 +0300 Subject: [PATCH 1/2] python310Packages.fs: propagate setuptools fixes pkgsCross.aarch64-multiplatform.python310Packages.statmake > ERROR: Could not find a version that satisfies the requirement setuptools (from fs) (from versions: none) > ERROR: No matching distribution found for setuptools --- pkgs/development/python-modules/fs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 32b5dd747dda..1d4326f74ee3 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -2,6 +2,7 @@ , glibcLocales , buildPythonPackage , fetchPypi +, setuptools , six , appdirs , scandir ? null @@ -32,7 +33,7 @@ buildPythonPackage rec { # strong cycle with paramaterized doCheck = false; checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; - propagatedBuildInputs = [ six appdirs pytz ] + propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] From c1896ff0654d819901433dff9572175c773d958b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 Aug 2022 21:03:34 +0300 Subject: [PATCH 2/2] python310Packages.pyatspi: fix cross python3.10-pyatspi> checking for a Python interpreter with version >= 2.6... none python3.10-pyatspi> configure: error: no suitable Python interpreter found then after PYTHON= python3.10-pyatspi> ./configure: line 3939: which: command not found --- pkgs/development/python-modules/pyatspi/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index f839dc4df312..d32a4a1ca3a1 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome, python }: buildPythonPackage rec { pname = "pyatspi"; @@ -17,6 +17,16 @@ buildPythonPackage rec { pygobject3 ]; + configureFlags = [ + "PYTHON=${python.pythonForBuild.interpreter}" + ]; + + postPatch = '' + # useless python existence check for us + substituteInPlace configure \ + --replace '&& ! which' '&& false' + ''; + disabled = !isPy3k; passthru = {