diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-13 16:44:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-13 16:44:56 +0100 |
commit | f2846df82382e364ff42b6665948c39886c6ec8f (patch) | |
tree | 8efef661858ea79964f84f4ceaa13bb0b99690c8 | |
parent | 721daaff828c7e5190243b9a5cd609eedf96326a (diff) | |
parent | a063e769663551b92687da9235c0b4b52454c988 (diff) |
Merge pull request #116128 from marcus7070/marcus7070/rtree-fix
python3Packages.Rtree: fix build
-rw-r--r-- | pkgs/development/python-modules/Rtree/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index b5996a13d981..eb4dae8e3aa2 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: +{ lib, + stdenv, + buildPythonPackage, + fetchPypi, + libspatialindex, + numpy, + pytestCheckHook +}: buildPythonPackage rec { pname = "Rtree"; @@ -9,21 +16,23 @@ buildPythonPackage rec { sha256 = "be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e"; }; - propagatedBuildInputs = [ libspatialindex ]; + buildInputs = [ libspatialindex ]; patchPhase = '' - substituteInPlace rtree/core.py --replace \ + substituteInPlace rtree/finder.py --replace \ "find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - # Tests appear to be broken due to mysterious memory unsafe issues. See #36760 - doCheck = false; - checkInputs = [ numpy ]; + checkInputs = [ + numpy + pytestCheckHook + ]; + pythonImportsCheck = [ "rtree" ]; meta = with lib; { description = "R-Tree spatial index for Python GIS"; homepage = "https://toblerity.org/rtree/"; - license = licenses.lgpl21; + license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; } |