From 7a7b9e09b26d4a9c2eeeeb2b8df7beac0690edff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 14 Aug 2024 10:47:19 -0700
Subject: [PATCH] libdeltachat: move to pkgs/by-name

---
 .../libraries => by-name/li}/libdeltachat/Cargo.lock   |  0
 .../li}/libdeltachat/no-static-lib.patch               |  0
 .../li/libdeltachat/package.nix}                       | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  4 ----
 4 files changed, 4 insertions(+), 10 deletions(-)
 rename pkgs/{development/libraries => by-name/li}/libdeltachat/Cargo.lock (100%)
 rename pkgs/{development/libraries => by-name/li}/libdeltachat/no-static-lib.patch (100%)
 rename pkgs/{development/libraries/libdeltachat/default.nix => by-name/li/libdeltachat/package.nix} (93%)

diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/by-name/li/libdeltachat/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/libdeltachat/Cargo.lock
rename to pkgs/by-name/li/libdeltachat/Cargo.lock
diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/by-name/li/libdeltachat/no-static-lib.patch
similarity index 100%
rename from pkgs/development/libraries/libdeltachat/no-static-lib.patch
rename to pkgs/by-name/li/libdeltachat/no-static-lib.patch
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/by-name/li/libdeltachat/package.nix
similarity index 93%
rename from pkgs/development/libraries/libdeltachat/default.nix
rename to pkgs/by-name/li/libdeltachat/package.nix
index 22a678a0c149..be37573e2e73 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -14,9 +14,7 @@
 , sqlcipher
 , sqlite
 , fixDarwinDylibNames
-, CoreFoundation
-, Security
-, SystemConfiguration
+, darwin
 , libiconv
 }:
 
@@ -61,9 +59,9 @@ in stdenv.mkDerivation rec {
     sqlcipher
     sqlite
   ] ++ lib.optionals stdenv.isDarwin [
-    CoreFoundation
-    Security
-    SystemConfiguration
+    darwin.apple_sdk.frameworks.CoreFoundation
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.SystemConfiguration
     libiconv
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b83636dbee8..095cf2073c6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21402,10 +21402,6 @@ with pkgs;
 
   libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { };
 
-  libdeltachat = callPackage ../development/libraries/libdeltachat {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
-  };
-
   libdevil = callPackage ../development/libraries/libdevil {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };