diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:50:01 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:38 +0200 |
| commit | 7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f (patch) | |
| tree | 8d5f610092d3284cf3f847d105c85f3743462e9c /pkgs/development/libraries/gdal | |
| parent | c4ffd141845bf35b4fa0f8c6420d554a4ae1e280 (diff) | |
| download | nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar.gz nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar.bz2 nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar.lz nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar.xz nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.tar.zst nixpkgs-7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f.zip | |
treewide: Make explicit that 'dev' output of zlib is used
Diffstat (limited to 'pkgs/development/libraries/gdal')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/gdal-1_11.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 40c8178834e..36019bdd7f7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -32,7 +32,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib}" # optional + "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib}/bin/mysql_config" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index fec52be924d..06f8afba334 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib}" # optional + "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib}/bin/mysql_config" |