pythonPackages.fiona: pin gdal to gdal_2
This commit is contained in:
parent
70671e71d1
commit
ca0fe27302
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
|
||||
, attrs, click, cligj, click-plugins, six, munch, enum34
|
||||
, pytest, boto3, mock
|
||||
, gdal
|
||||
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -16,11 +16,11 @@ buildPythonPackage rec {
|
|||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gdal # for gdal-config
|
||||
gdal_2 # for gdal-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
gdal_2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2718,7 +2718,7 @@ in {
|
|||
|
||||
filelock = callPackage ../development/python-modules/filelock {};
|
||||
|
||||
fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; };
|
||||
fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; };
|
||||
|
||||
fitbit = callPackage ../development/python-modules/fitbit { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue