diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2015-02-24 22:45:50 +0100 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2015-02-24 22:45:50 +0100 |
| commit | 8300898f98e235dcfa321887d52b7f72f80b5ad5 (patch) | |
| tree | bbcc0067cd295e8f5ff3c2feb6fbccb2dd318677 /pkgs | |
| parent | e453f994463c8a0c3da80434cadc2bcf9034789b (diff) | |
| parent | 3e87b82fe2eb1cff82789368952385416b3c83e4 (diff) | |
| download | nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar.gz nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar.bz2 nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar.lz nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar.xz nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.tar.zst nixpkgs-8300898f98e235dcfa321887d52b7f72f80b5ad5.zip | |
Merge pull request #6533 from michelk/gdal_1.11.2
gdal: update to 1.11.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b0feb2b6008..a59b526fee1 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}: composableDerivation.composableDerivation {} (fixed: rec { - version = "1.11.1"; + version = "1.11.2"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; + sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ]; @@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional + "--with-geos=${geos}/bin/geos-config"# optional ]; meta = { |