Merge pull request #178815 from lopsided98/geos-config-paths
geos: backport patch to fix config paths
This commit is contained in:
commit
9a2cb68e99
1 changed files with 9 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, cmake }:
|
, cmake }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,13 +13,15 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU=";
|
sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
patches = [
|
||||||
|
# Fix paths with absolute CMAKE_INSTALL_*DIR
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch";
|
||||||
|
hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
nativeBuildInputs = [ cmake ];
|
||||||
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)";
|
||||||
|
|
Loading…
Reference in a new issue