element-desktop: remove darwin frameworks, already part

of stdenv (cherry picked from commit 1d5dcb8)
NixOS · Dec 21, 2024 · 4a8e3e8 · 4a8e3e8
1 parent f49a12e
commit 4a8e3e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -8,8 +8,6 @@
   pkg-config,
   libsecret,
   xcbuild,
-  Security,
-  AppKit,
   fetchNpmDeps,
   npmHooks,
 }:
@@ -36,12 +34,7 @@ stdenv.mkDerivation rec {
     npmHooks.npmConfigHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
-  buildInputs =
-    lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Security
-      AppKit
-    ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
 
   npmDeps = fetchNpmDeps {
     inherit src;

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
@@ -13,7 +13,6 @@
   element-web,
   sqlcipher,
   callPackage,
-  darwin,
   desktopToDarwinBundle,
   useKeytar ? true,
   # command line arguments which are always set
@@ -24,8 +23,8 @@ let
   pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; };
-  seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; };
+  keytar = callPackage ./keytar { };
+  seshat = callPackage ./seshat { };
   electron = electron_33;
 in
 stdenv.mkDerivation (

diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
@@ -3,13 +3,11 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  rust,
   sqlcipher,
   nodejs,
   python3,
   yarn,
   fixup-yarn-lock,
-  CoreServices,
   fetchYarnDeps,
   removeReferencesTo,
 }:
@@ -37,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     yarn
     fixup-yarn-lock
   ];
-  buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices;
+  buildInputs = [ sqlcipher ];
 
   npm_config_nodedir = nodejs;