1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00

pythonPackages.fiona: fix linking issue

This commit is contained in:
Jonathan Ringer 2019-10-07 18:29:53 -07:00
parent 95ac9f695b
commit 405777bcf5
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0

View file

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34
, pytest, boto3, mock
, pytest, boto3, mock, giflib
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}:
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs";
};
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
nativeBuildInputs = [
gdal_2 # for gdal-config
@ -21,7 +21,7 @@ buildPythonPackage rec {
buildInputs = [
gdal_2
];
] ++ lib.optionals stdenv.cc.isClang [ giflib ];
propagatedBuildInputs = [
attrs
@ -30,12 +30,12 @@ buildPythonPackage rec {
click-plugins
six
munch
] ++ stdenv.lib.optional (!isPy3k) enum34;
] ++ lib.optional (!isPy3k) enum34;
checkInputs = [
pytest
boto3
] ++ stdenv.lib.optional (pythonOlder "3.4") mock;
] ++ lib.optional (pythonOlder "3.4") mock;
checkPhase = ''
rm -r fiona # prevent importing local fiona
@ -45,7 +45,7 @@ buildPythonPackage rec {
and not test_*_wheel"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "OGR's neat, nimble, no-nonsense API for Python";
homepage = http://toblerity.org/fiona/;
license = licenses.bsd3;