From 2758e7c246279992e117c1bbf9e92bb1bb4bdafb Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 30 Mar 2015 23:47:18 -0430 Subject: [PATCH] gdal: add libpng (for mysql workbench support) --- pkgs/development/libraries/gdal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 579d22ad754a..7722dd83183f 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, libpng }: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -19,6 +20,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg}" "--with-libtiff=${libtiff}" # optional (without largetiff support) + "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config"