ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-09 05:58:34 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #186471 from Artturin/fsprop

Browse Source
This commit is contained in:
Artturi 2022-08-13 22:58:29 +03:00 committed by GitHub
commit c4e9b64e7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/fs/default.nix
View File

@ -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 ]

12
pkgs/development/python-modules/pyatspi/default.nix
View File

@ -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 = {