From 516f909acbe0a22d39daf71c3808accc3014202f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 2 May 2017 22:21:03 +0200 Subject: [PATCH] gdal: fix darwin build --- pkgs/development/libraries/gdal/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e39d39ab81b5..599a2c70f139 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite -, netcdf, hdf5 , curl -, netcdfSupport ? true - }: +, libiconv +, netcdfSupport ? true, netcdf, hdf5 , curl +}: with stdenv.lib; - + composableDerivation.composableDerivation {} (fixed: rec { version = "2.1.3"; name = "gdal-${version}"; @@ -18,7 +18,8 @@ composableDerivation.composableDerivation {} (fixed: rec { buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite libspatialite ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]); + ++ stdenv.lib.optional stdenv.isDarwin libiconv + ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; hardeningDisable = [ "format" ];