jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdal: 3.0.4 -> 3.1.2.post2020-08-26

Browse Source 
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.
This commit is contained in:
Jonathan Ringer 2020-08-26 00:15:55 -07:00 committed by Frederik Rietdijk
parent 744601b6e5
commit bd6bfd53e7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gdal/default.nix
View File

@ -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 "")
];