summary refs log tree commit diff
path: root/pkgs/development/libraries/gdal
diff options
context:
space:
mode:
authorKarn Kallio <kkallio@skami.org>2015-03-30 23:47:18 -0430
committerPeter Simons <simons@cryp.to>2015-03-31 13:21:02 +0200
commit2758e7c246279992e117c1bbf9e92bb1bb4bdafb (patch)
tree316829f51290790636fe37ee303e89159780123b /pkgs/development/libraries/gdal
parentb4824ffc5d41a788a12eb70ec9999fbdae43d744 (diff)
downloadnixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar.gz
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar.bz2
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar.lz
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar.xz
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.tar.zst
nixlib-2758e7c246279992e117c1bbf9e92bb1bb4bdafb.zip
gdal: add libpng (for mysql workbench support)
Diffstat (limited to 'pkgs/development/libraries/gdal')
-rw-r--r--pkgs/development/libraries/gdal/default.nix6
1 files 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"