arti: move to by-name

Move the package to the new by-name structure.
NixOS · Sep 28, 2024 · 5136e37 · 5136e37
1 parent 19d2ec0
commit 5136e37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkgs/tools/security/arti/default.nix → pkgs/by-name/ar/arti/package.nix b/pkgs/tools/security/arti/default.nix → 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
@@ -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 { };