From 439271b6eabfe60f8e951df428d6ebceb1055451 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 11 Mar 2024 23:30:20 +0400
Subject: [PATCH] t-rex: migrate to by-name

---
 .../t-rex/default.nix => by-name/t-/t-rex/package.nix}       | 5 +++--
 pkgs/top-level/all-packages.nix                              | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{servers/geospatial/t-rex/default.nix => by-name/t-/t-rex/package.nix} (86%)

diff --git a/pkgs/servers/geospatial/t-rex/default.nix b/pkgs/by-name/t-/t-rex/package.nix
similarity index 86%
rename from pkgs/servers/geospatial/t-rex/default.nix
rename to pkgs/by-name/t-/t-rex/package.nix
index b3208275b6a4..f26592e052d0 100644
--- a/pkgs/servers/geospatial/t-rex/default.nix
+++ b/pkgs/by-name/t-/t-rex/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "t-rex";
@@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
 
-  buildInputs = [ gdal openssl ] ++ lib.optional stdenv.isDarwin Security;
+  buildInputs = [ gdal openssl ]
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   meta = with lib; {
     description = "Vector tile server specialized on publishing MVT tiles";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a8b324d91da..a44281ec22f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27236,10 +27236,6 @@ with pkgs;
 
   pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { };
 
-  t-rex = callPackage ../servers/geospatial/t-rex {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   tegola = callPackage ../servers/geospatial/tegola { };
 
   tile38 = callPackage ../servers/geospatial/tile38 { };