From f826c0aafaea04387c9dee913149aff5801b479b Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 30 Nov 2024 08:51:52 -0500
Subject: [PATCH] fedimint: drop various darwin workarounds, use new sdk
 pattern

---
 pkgs/by-name/fe/fedimint/package.nix | 26 ++------------------------
 pkgs/top-level/all-packages.nix      |  4 ----
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index 179227a49c12..246375fff66a 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -1,28 +1,13 @@
 { lib
 , buildPackages
-, clang
 , fetchFromGitHub
-, libclang
-, libiconv
-, llvmPackages_12
 , openssl
 , pkg-config
 , protobuf
 , rustPlatform
-, stdenv
-, Security
-, SystemConfiguration
 }:
-let
-  # Rust rocksdb bindings have C++ compilation/linking errors on Darwin when using newer clang
-  # Forcing it to clang 12 fixes the issue.
-  buildRustPackage =
-    if stdenv.hostPlatform.isDarwin then
-      rustPlatform.buildRustPackage.override { stdenv = llvmPackages_12.stdenv; }
-    else
-      rustPlatform.buildRustPackage;
-in
-buildRustPackage rec {
+
+rustPlatform.buildRustPackage rec {
   pname = "fedimint";
   version = "0.4.4";
 
@@ -38,18 +23,11 @@ buildRustPackage rec {
   nativeBuildInputs = [
     protobuf
     pkg-config
-    clang
-    (lib.getLib libclang)
     rustPlatform.bindgenHook
   ];
 
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    libiconv
-    Security
-    SystemConfiguration
   ];
 
   outputs = [ "out" "fedimintCli" "fedimint" "gateway" "gatewayCli" "devimint" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..99b261a4a55e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2345,10 +2345,6 @@ with pkgs;
 
   fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { };
 
-  fedimint = callPackage ../by-name/fe/fedimint/package.nix {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
-  };
-
   flowgger = callPackage ../tools/misc/flowgger {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };