From f9310ec1a92a072f2d267b73a423ad18cfa1f07c Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Sat, 2 Nov 2024 11:13:24 +0100
Subject: [PATCH] trunk: fix build on darwin; move to by-name

---
 .../trunk/default.nix => by-name/tr/trunk/package.nix}     | 7 +------
 pkgs/top-level/all-packages.nix                            | 4 ----
 2 files changed, 1 insertion(+), 10 deletions(-)
 rename pkgs/{development/tools/trunk/default.nix => by-name/tr/trunk/package.nix} (83%)

diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/by-name/tr/trunk/package.nix
similarity index 83%
rename from pkgs/development/tools/trunk/default.nix
rename to pkgs/by-name/tr/trunk/package.nix
index 0acd5fc66141..e82b79a07bf3 100644
--- a/pkgs/development/tools/trunk/default.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -1,11 +1,8 @@
 { lib,
-stdenv,
 rustPlatform,
 fetchFromGitHub,
 pkg-config,
 openssl,
-CoreServices,
-SystemConfiguration
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,9 +17,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = if stdenv.hostPlatform.isDarwin
-    then [ CoreServices SystemConfiguration ]
-    else [ openssl ];
+  buildInputs = [ openssl ];
   # requires network
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f95d4e7cde6d..5267ba375507 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12887,10 +12887,6 @@ with pkgs;
 
   trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
 
-  trunk = callPackage ../development/tools/trunk {
-    inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
-  };
-
   trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };