JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25459 from LnL7/darwin-gdal

Browse Source 
gdal: fix darwin build
This commit is contained in:
Frederik Rietdijk 2017-05-03 08:13:51 +02:00 committed by GitHub
commit 8d52769ef2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/gdal/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite , libpng, sqlite, libspatialite
, netcdf, hdf5 , curl , libiconv
, netcdfSupport ? true , netcdfSupport ? true, netcdf, hdf5 , curl
}: }:
with stdenv.lib; with stdenv.lib;
composableDerivation.composableDerivation {} (fixed: rec { composableDerivation.composableDerivation {} (fixed: rec {
version = "2.1.3"; version = "2.1.3";
name = "gdal-${version}"; name = "gdal-${version}";
@ -18,7 +18,8 @@ composableDerivation.composableDerivation {} (fixed: rec {
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite libspatialite ] buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite libspatialite ]
++ (with pythonPackages; [ python numpy wrapPython ]) ++ (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" ]; hardeningDisable = [ "format" ];