gdal: add libpng (for mysql workbench support)
This commit is contained in:
parent
b4824ffc5d
commit
2758e7c246
@ -1,5 +1,6 @@
|
|||||||
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
|
{ 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 {
|
composableDerivation.composableDerivation {} (fixed: rec {
|
||||||
version = "1.11.2";
|
version = "1.11.2";
|
||||||
@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||||||
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
|
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.
|
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
|
||||||
# Unset CC and CXX as they confuse libtool.
|
# Unset CC and CXX as they confuse libtool.
|
||||||
@ -19,6 +20,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-jpeg=${libjpeg}"
|
"--with-jpeg=${libjpeg}"
|
||||||
"--with-libtiff=${libtiff}" # optional (without largetiff support)
|
"--with-libtiff=${libtiff}" # optional (without largetiff support)
|
||||||
|
"--with-libpng=${libpng}" # optional
|
||||||
"--with-libz=${zlib}" # optional
|
"--with-libz=${zlib}" # optional
|
||||||
|
|
||||||
"--with-pg=${postgresql}/bin/pg_config"
|
"--with-pg=${postgresql}/bin/pg_config"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user