From 2a7f5c37803aa804a57f4a957b14ce9bd995950f Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 3 Mar 2017 18:45:14 +0100 Subject: [PATCH] use old geos 3.5.0 --- geos.nix | 6 ++++-- osm2pgsql/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/geos.nix b/geos.nix index 1a9de60..4dce586 100644 --- a/geos.nix +++ b/geos.nix @@ -11,11 +11,13 @@ composableDerivation.composableDerivation {} rec { # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - name = "geos-3.6.1"; + #name = "geos-3.6.1"; + #sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; + name = "geos-3.5.0"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; + sha256 = "00mfs2qriamqypia5r86p3g4wd955sw3dcfs6crsar7sphijp629"; }; enableParallelBuilding = true; diff --git a/osm2pgsql/default.nix b/osm2pgsql/default.nix index 1eef554..66344e9 100644 --- a/osm2pgsql/default.nix +++ b/osm2pgsql/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { # https://github.com/openstreetmap/osm2pgsql/issues/634 # https://bz-attachments.freebsd.org/attachment.cgi?id=177390 - patches = [ - ./use-geos36.patch - ]; + #patches = [ + # ./use-geos36.patch + #]; #nativeBuildInputs = [ ]; buildInputs = [