diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 355e9e5f07f..fe698d86a85 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, cmake }: stdenv.mkDerivation rec { pname = "geos"; - version = "3.9.1"; + version = "3.10.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; + sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; }; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; - # https://trac.osgeo.org/geos/ticket/993 - configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + postPatch = '' + substituteInPlace tools/geos-config.in \ + --replace "@libdir@" "@prefix@/lib" \ + --replace "@includedir@" "@prefix@/include" + ''; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index b3d61e6efd7..dded351d310 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite -, luajit, geos, python3, zeromq }: +, luajit, geos39, python3, zeromq }: stdenv.mkDerivation rec { pname = "valhalla"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl protobuf prime-server boost sqlite libspatialite - luajit geos python3 zeromq + luajit geos39 python3 zeromq ]; cmakeFlags = [