geos: 3.9.1 -> 3.10.2
This commit is contained in:
parent
06e3b4f7a0
commit
65e92f7028
|
@ -1,18 +1,24 @@
|
||||||
{ lib, stdenv, fetchurl }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, cmake }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "geos";
|
pname = "geos";
|
||||||
version = "3.9.1";
|
version = "3.10.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2";
|
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
|
postPatch = ''
|
||||||
configureFlags = lib.optional stdenv.isAarch32 "--disable-inline";
|
substituteInPlace tools/geos-config.in \
|
||||||
|
--replace "@libdir@" "@prefix@/lib" \
|
||||||
|
--replace "@includedir@" "@prefix@/include"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "C++ port of the Java Topology Suite (JTS)";
|
description = "C++ port of the Java Topology Suite (JTS)";
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||||
, zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite
|
, zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite
|
||||||
, luajit, geos, python3, zeromq }:
|
, luajit, geos39, python3, zeromq }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "valhalla";
|
pname = "valhalla";
|
||||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
zlib curl protobuf prime-server boost sqlite libspatialite
|
zlib curl protobuf prime-server boost sqlite libspatialite
|
||||||
luajit geos python3 zeromq
|
luajit geos39 python3 zeromq
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
Loading…
Reference in a new issue