From 5136e375f2e764f7d11ec87455ca05498f723af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Sun, 22 Sep 2024 15:56:38 +0300
Subject: [PATCH] arti: move to by-name

Move the package to the new by-name structure.
---
 .../arti/default.nix => by-name/ar/arti/package.nix}  | 11 ++++++++---
 pkgs/top-level/all-packages.nix                       |  4 ----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/{tools/security/arti/default.nix => by-name/ar/arti/package.nix} (86%)

diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/by-name/ar/arti/package.nix
similarity index 86%
rename from pkgs/tools/security/arti/default.nix
rename to pkgs/by-name/ar/arti/package.nix
index 1e93dae95961..4e2c7495d850 100644
--- a/pkgs/tools/security/arti/default.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , sqlite
 , openssl
-, CoreServices
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,8 +26,13 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
   buildInputs = [ sqlite ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+    ++ lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        CoreServices
+      ]
+    );
 
   cargoBuildFlags = [ "--package" "arti" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b79143c50a5f..22b340c16c69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -293,10 +293,6 @@ with pkgs;
 
   ares-rs = callPackage ../tools/security/ares-rs { };
 
-  arti = callPackage ../tools/security/arti {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
-
   asn1c = callPackage ../development/compilers/asn1c { };
 
   authz0 = callPackage ../tools/security/authz0 { };