diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/by-name/li/libspatialindex/package.nix similarity index 66% rename from pkgs/development/libraries/libspatialindex/default.nix rename to pkgs/by-name/li/libspatialindex/package.nix index 0f9d958ab8c9..ead9fe2b09e0 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -15,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -31,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + + meta = { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 399de17d3985..40c6d9c5fc75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21830,8 +21830,6 @@ with pkgs; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - libspatialite = callPackage ../development/libraries/libspatialite { }; libstatgrab = callPackage ../development/libraries/libstatgrab {