From 7826af1870e4abe3283b6db23c0214a366a44abe Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Thu, 29 Aug 2024 09:24:37 +0200
Subject: [PATCH] libspatialindex: 1.9.3 -> 2.0.0

Nixpkgs PR:
https://github.com/NixOS/nixpkgs/pull/318245
---
 pkgs/libspatialindex/default.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/libspatialindex/default.nix b/pkgs/libspatialindex/default.nix
index e1f93c82..0f9d958a 100644
--- a/pkgs/libspatialindex/default.nix
+++ b/pkgs/libspatialindex/default.nix
@@ -1,29 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libspatialindex";
-  version = "1.9.3";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "libspatialindex";
     repo = "libspatialindex";
     rev = finalAttrs.version;
-    hash = "sha256-zsvS0IkCXyuNLCQpccKdAsFKoq0l+y66ifXlTHLNTkc=";
+    hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20=";
   };
 
-  patches = [
-    # Allow building static libs
-    (fetchpatch {
-      name = "fix-static-lib-build.patch";
-      url = "https://github.com/libspatialindex/libspatialindex/commit/caee28d84685071da3ff3a4ea57ff0b6ae64fc87.patch";
-      hash = "sha256-nvTW/t9tw1ZLeycJY8nj7rQgZogxQb765Ca2b9NDvRo=";
-    })
-  ];
+  postPatch = ''
+    patchShebangs test/
+  '';
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DSIDX_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
+
+    # The cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR
+    # correctly (setting it to an absolute path causes include files to go to
+    # $out/$out/include,  because the absolute path is interpreted with root
+    # at $out).
+    # See: https://github.com/NixOS/nixpkgs/issues/144170
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
   doCheck = true;