From d0d5a6dbcc84fc051ba3b804c7d2a178dbf87c47 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:26 +0100 Subject: [PATCH 1/2] libgeotiff: enable darwin support --- pkgs/development/libraries/libgeotiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 496306c254d2..389f899e3ef7 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.remotesensing.org/geotiff/geotiff.html; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 9141b8cad1b36511856732aaf00a5f788f1edbc0 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:53 +0100 Subject: [PATCH 2/2] 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. --- pkgs/development/libraries/gdal/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ce3e0f61972f..173e6411182d 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; }; })