diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-08-26 00:15:55 -0700 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-08-26 12:38:57 +0200 |
| commit | bd6bfd53e747936c04d60707d18e6543a10c4138 (patch) | |
| tree | ff634f16a417e7237dd56dcc6100f94a6a097dad /pkgs/development/libraries/gdal | |
| parent | 744601b6e5ab9ee5cb84a7e8c4d386e701be8a4a (diff) | |
| download | nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar.gz nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar.bz2 nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar.lz nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar.xz nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.tar.zst nixpkgs-bd6bfd53e747936c04d60707d18e6543a10c4138.zip | |
gdal: 3.0.4 -> 3.1.2.post2020-08-26
parsing of POPPLER_MINOR_VERSION is broken, as it doesn't truncate leading zeroes. Leading gcc to believe it's trying to evaluate an octal value (e.g. 08 > 72 ). However, 8 isn't a valid octal value. Patches from master do not apply cleanly do a series of changes done to configure.ac. So instead, a commit from master was chosen.
Diffstat (limited to 'pkgs/development/libraries/gdal')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7f3e796bbf1..72135f1a62d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.4"; + # broken with poppler 20.08, however, can't fetch patches cleanly + version = "3.1.2.post2020-08-26"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${version}"; - sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c"; + rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9"; + sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9"; }; sourceRoot = "source/gdal"; @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { "--with-proj=${proj.dev}" # optional "--with-geos=${geos}/bin/geos-config" # optional "--with-hdf4=${hdf4.dev}" # optional - "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional + "--with-xml2=yes" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; |