From 491f5ebe713a44ecd16373cd8b6233fe0f052a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 14 Aug 2024 10:54:01 -0700
Subject: [PATCH] deltachat-desktop: move to pkgs/by-name

---
 .../de/deltachat-desktop/package.nix}                      | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 5 -----
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/deltachat-desktop/default.nix => by-name/de/deltachat-desktop/package.nix} (97%)

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
similarity index 97%
rename from pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
rename to pkgs/by-name/de/deltachat-desktop/package.nix
index 67e4ebcdd284..bf70d4672a05 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -1,7 +1,7 @@
 { lib
 , buildNpmPackage
 , copyDesktopItems
-, electron
+, electron_30
 , buildGoModule
 , esbuild
 , fetchFromGitHub
@@ -15,12 +15,13 @@
 , roboto
 , sqlcipher
 , stdenv
-, CoreServices
+, darwin
 , testers
 , deltachat-desktop
 }:
 
 let
+  electron = electron_30;
   esbuild' = esbuild.override {
     buildGoModule = args: buildGoModule (args // rec {
       version = "0.19.12";
@@ -59,7 +60,7 @@ buildNpmPackage rec {
   buildInputs = [
     deltachat-rpc-server
   ] ++ lib.optionals stdenv.isDarwin [
-    CoreServices
+    darwin.apple_sdk.frameworks.CoreServices
   ];
 
   env = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 095cf2073c6a..2a7f52326ecd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3583,11 +3583,6 @@ with pkgs;
 
   dell-command-configure = callPackage ../tools/system/dell-command-configure { };
 
-  deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop {
-    electron = electron_30;
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
-
   deskew = callPackage ../applications/graphics/deskew { };
 
   detect-secrets = with python3Packages; toPythonApplication detect-secrets;