diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-10-07 18:29:53 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-10-10 18:27:02 -0700 |
commit | 405777bcf5841871436c1b46f93b64a65b398c07 (patch) | |
tree | 64ac233be0439d52cc6bd020608c3763264f86c7 /pkgs/development/python-modules/fiona | |
parent | 95ac9f695b0978c6ce3e6fa4ed11869dd93edc73 (diff) | |
download | nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar.gz nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar.bz2 nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar.lz nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar.xz nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.tar.zst nixpkgs-405777bcf5841871436c1b46f93b64a65b398c07.zip |
pythonPackages.fiona: fix linking issue
Diffstat (limited to 'pkgs/development/python-modules/fiona')
-rw-r--r-- | pkgs/development/python-modules/fiona/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 6dd74742741..d6e4ef8d1bb 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -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; |