nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 09:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

geos: 3.9.1 -> 3.10.2

Browse Source
This commit is contained in:
Will Cohen 2022-03-22 16:03:34 -04:00
parent 06e3b4f7a0
commit 65e92f7028
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/geos/default.nix
View File

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

4
pkgs/development/libraries/valhalla/default.nix
View File

@ -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 = [