ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 03:57:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #318245 from imincik/libspatialindex-2.0.0

Browse Source 
libspatialindex: 1.9.3 -> 2.0.0
This commit is contained in:
Ivan Mincik 2024-08-26 09:47:30 +00:00 committed by GitHub
commit edcb325fc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/libspatialindex/default.nix
View File

@ -1,29 +1,32 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: { lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "libspatialindex"; pname = "libspatialindex";
version = "1.9.3"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libspatialindex"; owner = "libspatialindex";
repo = "libspatialindex"; repo = "libspatialindex";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-zsvS0IkCXyuNLCQpccKdAsFKoq0l+y66ifXlTHLNTkc="; hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20=";
}; };
patches = [ postPatch = ''
# Allow building static libs patchShebangs test/
(fetchpatch { '';
name = "fix-static-lib-build.patch";
url = "https://github.com/libspatialindex/libspatialindex/commit/caee28d84685071da3ff3a4ea57ff0b6ae64fc87.patch";
hash = "sha256-nvTW/t9tw1ZLeycJY8nj7rQgZogxQb765Ca2b9NDvRo=";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ 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; doCheck = true;