diff options
| author | Josef Kemetmueller <josef.kemetmueller@aon.at> | 2016-11-07 20:42:53 +0100 |
|---|---|---|
| committer | Josef Kemetmueller <josef.kemetmueller@aon.at> | 2016-11-07 20:42:53 +0100 |
| commit | 9141b8cad1b36511856732aaf00a5f788f1edbc0 (patch) | |
| tree | bdd42a6d115c43813eefaebacc5115abfbbd6f41 /pkgs/development/libraries/gdal | |
| parent | d0d5a6dbcc84fc051ba3b804c7d2a178dbf87c47 (diff) | |
| download | nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar.gz nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar.bz2 nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar.lz nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar.xz nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.tar.zst nixpkgs-9141b8cad1b36511856732aaf00a5f788f1edbc0.zip | |
gdal: enable darwin support
Also some minor tweaks: There didn't seem any need to use -O0 optimization level anymore. Also the option "with-libpng" should have been "with-png" all along.
Diffstat (limited to 'pkgs/development/libraries/gdal')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ce3e0f61972..173e6411182 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -20,14 +20,13 @@ composableDerivation.composableDerivation {} (fixed: rec { hardeningDisable = [ "format" ]; - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. - preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; + preConfigure = "unset CC CXX"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-libpng=${libpng.dev}" # optional + "--with-png=${libpng.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" @@ -53,6 +52,6 @@ composableDerivation.composableDerivation {} (fixed: rec { homepage = http://www.gdal.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; }) |