From 3a8dfd5c34e31347af93f07f0ef329007b712d1d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:36:24 +0400 Subject: [PATCH 1/3] libspatialindex: fix on darwin --- pkgs/development/libraries/libspatialindex/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 0f9d958ab8c9..e8cce6133c1f 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -31,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + meta = with lib; { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; From 27336c661940b1aff02e3e122c0756c4d712d84b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:46:31 +0400 Subject: [PATCH 2/3] libspatialindex: migrate to by-name --- .../default.nix => by-name/li/libspatialindex/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libspatialindex/default.nix => by-name/li/libspatialindex/package.nix} (100%) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/by-name/li/libspatialindex/package.nix similarity index 100% rename from pkgs/development/libraries/libspatialindex/default.nix rename to pkgs/by-name/li/libspatialindex/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5a5ece5be8..3f553a3aad40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21845,8 +21845,6 @@ with pkgs; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - libspatialite = callPackage ../development/libraries/libspatialite { }; libstatgrab = callPackage ../development/libraries/libstatgrab { From a5599c35f17f682763cf078751968e00f17ea4e8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:49:55 +0400 Subject: [PATCH 3/3] libspatialindex: nixfmt-rfc-style --- pkgs/by-name/li/libspatialindex/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix index e8cce6133c1f..ead9fe2b09e0 100644 --- a/pkgs/by-name/li/libspatialindex/package.nix +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -35,11 +41,11 @@ stdenv.mkDerivation (finalAttrs: { install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib ''; - meta = with lib; { + 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; }; })