From a70782ddb4a9b7366a2becea10d796ebde22d875 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:37:19 -0300
Subject: [PATCH 1/5] element-desktop: 1.11.87 -> 1.11.89

https://github.com/element-hq/element-desktop/releases/tag/v1.11.88
https://github.com/element-hq/element-desktop/releases/tag/v1.11.89
---
 .../networking/instant-messengers/element/pin.nix      | 10 +++++-----
 .../el/element-web-unwrapped/element-web-pin.nix       |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix
index 2f12882e5ef0..7c765a5350d9 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
 {
-  "version" = "1.11.87";
+  "version" = "1.11.89";
   "hashes" = {
-    "desktopSrcHash" = "sha256-rIxuXMHQVJrbfWibpiIBmTkXKHrBqnTMiBYIP8VOIH4=";
-    "desktopYarnHash" = "05qs1an3mbqsfn1nmgwagp564lqvyrbkyj58z5h2cbczqbavnxxz";
-    "webSrcHash" = "sha256-FcXYwYCx//fqWuUKRqTTntlT7jVBD1Heayg4T7ACHmc=";
-    "webYarnHash" = "0anamnfm5g4nj7wp18byi49x38aia490qfard2d34myzjgiby8v3";
+    "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";
+    "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";
+    "webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js=";
+    "webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44";
   };
 }
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
new file mode 100644
index 000000000000..6bd45a77319d
--- /dev/null
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -0,0 +1,7 @@
+{
+  "version" = "1.11.89";
+  "hashes" = {
+    "webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs=";
+    "webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx";
+  };
+}

From 773b01fb272f78516d8f92104ccb6a3f0b0cde60 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:59:52 -0300
Subject: [PATCH 2/5] element-{web,desktop}: move to pkgs/by-name,

element-desktop-wayland: drop
---
 .../element-desktop/element-desktop-pin.nix}   |  2 --
 .../el/element-desktop}/keytar/default.nix     |  0
 .../el/element-desktop}/keytar/pin.json        |  0
 .../el/element-desktop}/keytar/update.sh       |  0
 .../el/element-desktop/package.nix}            | 11 +++++------
 .../el/element-desktop}/seshat/default.nix     |  0
 .../el/element-desktop}/seshat/pin.json        |  0
 .../el/element-desktop}/seshat/update.sh       |  0
 .../el/element-desktop}/update.sh              | 18 ++++++++++++++----
 .../el/element-web-unwrapped/package.nix}      |  3 ++-
 .../el/element-web/package.nix}                |  0
 pkgs/top-level/aliases.nix                     |  2 +-
 pkgs/top-level/all-packages.nix                | 14 --------------
 13 files changed, 22 insertions(+), 28 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/element/pin.nix => by-name/el/element-desktop/element-desktop-pin.nix} (57%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/default.nix (100%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/pin.json (100%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/update.sh (100%)
 rename pkgs/{applications/networking/instant-messengers/element/element-desktop.nix => by-name/el/element-desktop/package.nix} (94%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/default.nix (100%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/pin.json (100%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/update.sh (100%)
 rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/update.sh (83%)
 rename pkgs/{applications/networking/instant-messengers/element/element-web.nix => by-name/el/element-web-unwrapped/package.nix} (98%)
 rename pkgs/{applications/networking/instant-messengers/element/element-web-wrapper.nix => by-name/el/element-web/package.nix} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
similarity index 57%
rename from pkgs/applications/networking/instant-messengers/element/pin.nix
rename to pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 7c765a5350d9..ed64279ccb16 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -3,7 +3,5 @@
   "hashes" = {
     "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";
     "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";
-    "webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js=";
-    "webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/keytar/default.nix
rename to pkgs/by-name/el/element-desktop/keytar/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/pkgs/by-name/el/element-desktop/keytar/pin.json
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/keytar/pin.json
rename to pkgs/by-name/el/element-desktop/keytar/pin.json
diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/by-name/el/element-desktop/keytar/update.sh
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/keytar/update.sh
rename to pkgs/by-name/el/element-desktop/keytar/update.sh
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/by-name/el/element-desktop/package.nix
similarity index 94%
rename from pkgs/applications/networking/instant-messengers/element/element-desktop.nix
rename to pkgs/by-name/el/element-desktop/package.nix
index 3bccfdec1d68..1afb094d7e5a 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -13,9 +13,7 @@
   element-web,
   sqlcipher,
   callPackage,
-  Security,
-  AppKit,
-  CoreServices,
+  darwin,
   desktopToDarwinBundle,
   useKeytar ? true,
   # command line arguments which are always set
@@ -23,11 +21,11 @@
 }:
 
 let
-  pinData = import ./pin.nix;
+  pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  keytar = callPackage ./keytar { inherit Security AppKit; };
-  seshat = callPackage ./seshat { inherit CoreServices; };
+  keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; };
+  seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; };
   electron = electron_33;
 in
 stdenv.mkDerivation (
@@ -146,6 +144,7 @@ stdenv.mkDerivation (
     '';
 
     passthru = {
+      # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
       updateScript = ./update.sh;
 
       # TL;DR: keytar is optional while seshat isn't.
diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/seshat/default.nix
rename to pkgs/by-name/el/element-desktop/seshat/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/pkgs/by-name/el/element-desktop/seshat/pin.json
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/seshat/pin.json
rename to pkgs/by-name/el/element-desktop/seshat/pin.json
diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/pkgs/by-name/el/element-desktop/seshat/update.sh
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/seshat/update.sh
rename to pkgs/by-name/el/element-desktop/seshat/update.sh
diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/by-name/el/element-desktop/update.sh
similarity index 83%
rename from pkgs/applications/networking/instant-messengers/element/update.sh
rename to pkgs/by-name/el/element-desktop/update.sh
index 2a4ec5fcdec2..20251b2644a4 100755
--- a/pkgs/applications/networking/instant-messengers/element/update.sh
+++ b/pkgs/by-name/el/element-desktop/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
+#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
 
 if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
   echo "Regenerates packaging data for the element packages."
@@ -22,6 +22,8 @@ version="${version#v}"
 web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version"
 web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash)
 
+cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1
+
 web_tmpdir=$(mktemp -d)
 trap 'rm -rf "$web_tmpdir"' EXIT
 
@@ -42,14 +44,22 @@ wget -q "$desktop_src/yarn.lock"
 desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock)
 popd
 
-cat > pin.nix << EOF
+cat > ../element-web-unwrapped/element-web-pin.nix << EOF
 {
   "version" = "$version";
   "hashes" = {
-    "desktopSrcHash" = "$desktop_src_hash";
-    "desktopYarnHash" = "$desktop_yarn_hash";
     "webSrcHash" = "$web_src_hash";
     "webYarnHash" = "$web_yarn_hash";
   };
 }
 EOF
+
+cat > element-desktop-pin.nix << EOF
+{
+  "version" = "$version";
+  "hashes" = {
+    "desktopSrcHash" = "$desktop_src_hash";
+    "desktopYarnHash" = "$desktop_yarn_hash";
+  };
+}
+EOF
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
similarity index 98%
rename from pkgs/applications/networking/instant-messengers/element/element-web.nix
rename to pkgs/by-name/el/element-web-unwrapped/package.nix
index 1bfea7162dde..9a7ced0e8d51 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  pinData = import ./pin.nix;
+  pinData = import ./element-web-pin.nix;
   inherit (pinData.hashes) webSrcHash webYarnHash;
   noPhoningHome = {
     disable_guests = true; # disable automatic guest account registration at matrix.org
@@ -83,3 +83,4 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
     platforms = lib.platforms.all;
   };
 })
+
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/by-name/el/element-web/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix
rename to pkgs/by-name/el/element-web/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 74e47c2d0be7..2cb6b7113f8f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -321,7 +321,7 @@ mapAliases {
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   elasticsearch7Plugins = elasticsearchPlugins;
 
-  # Electron
+  element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
 
 
   elixir_ls = elixir-ls; # Added 2023-03-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d203cce4a970..f9cbdba067b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2290,20 +2290,6 @@ with pkgs;
 
   electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
 
-  element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
-    inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
-  };
-  element-desktop-wayland = writeScriptBin "element-desktop" ''
-    #!/bin/sh
-    NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@"
-  '';
-
-  element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { };
-
-  element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix {
-    conf = config.element-web.conf or { };
-  };
-
   elm-github-install = callPackage ../tools/package-management/elm-github-install { };
 
   espanso-wayland = espanso.override {

From 8c4fbc5de0fb7d5fd847e845303abfe469055cd2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:03:47 -0300
Subject: [PATCH 3/5] element-web: format with `nixfmt-rfc-style`

---
 .../el/element-web-unwrapped/package.nix      | 135 ++++++++++--------
 1 file changed, 72 insertions(+), 63 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index 9a7ced0e8d51..b03d2a2c79a8 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchYarnDeps
-, jq
-, yarn
-, fixup-yarn-lock
-, nodejs
-, jitsi-meet
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  jq,
+  yarn,
+  fixup-yarn-lock,
+  nodejs,
+  jitsi-meet,
 }:
 
 let
@@ -16,71 +17,79 @@ let
     disable_guests = true; # disable automatic guest account registration at matrix.org
   };
 in
-stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
-  pname = "element-web";
+stdenv.mkDerivation (
+  finalAttrs:
+  builtins.removeAttrs pinData [ "hashes" ]
+  // {
+    pname = "element-web";
 
-  src = fetchFromGitHub {
-    owner = "element-hq";
-    repo = "element-web";
-    rev = "v${finalAttrs.version}";
-    hash = webSrcHash;
-  };
+    src = fetchFromGitHub {
+      owner = "element-hq";
+      repo = "element-web";
+      rev = "v${finalAttrs.version}";
+      hash = webSrcHash;
+    };
 
-  offlineCache = fetchYarnDeps {
-    yarnLock = finalAttrs.src + "/yarn.lock";
-    sha256 = webYarnHash;
-  };
+    offlineCache = fetchYarnDeps {
+      yarnLock = finalAttrs.src + "/yarn.lock";
+      sha256 = webYarnHash;
+    };
 
-  nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ];
+    nativeBuildInputs = [
+      yarn
+      fixup-yarn-lock
+      jq
+      nodejs
+    ];
 
-  buildPhase = ''
-    runHook preBuild
+    buildPhase = ''
+      runHook preBuild
 
-    export VERSION=${finalAttrs.version}
-    yarn --offline build:res
-    yarn --offline build:module_system
-    yarn --offline build:bundle
+      export VERSION=${finalAttrs.version}
+      yarn --offline build:res
+      yarn --offline build:module_system
+      yarn --offline build:bundle
 
-    runHook postBuild
-  '';
+      runHook postBuild
+    '';
 
-  configurePhase = ''
-    runHook preConfigure
+    configurePhase = ''
+      runHook preConfigure
 
-    export HOME=$PWD/tmp
-    # with the update of openssl3, some key ciphers are not supported anymore
-    # this flag will allow those codecs again as a workaround
-    # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
-    # and https://github.com/element-hq/element-web/issues/21043
-    export NODE_OPTIONS=--openssl-legacy-provider
-    mkdir -p $HOME
+      export HOME=$PWD/tmp
+      # with the update of openssl3, some key ciphers are not supported anymore
+      # this flag will allow those codecs again as a workaround
+      # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
+      # and https://github.com/element-hq/element-web/issues/21043
+      export NODE_OPTIONS=--openssl-legacy-provider
+      mkdir -p $HOME
 
-    fixup-yarn-lock yarn.lock
-    yarn config --offline set yarn-offline-mirror $offlineCache
-    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-    patchShebangs node_modules
+      fixup-yarn-lock yarn.lock
+      yarn config --offline set yarn-offline-mirror $offlineCache
+      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
+      patchShebangs node_modules
 
-    runHook postConfigure
-  '';
+      runHook postConfigure
+    '';
 
-  installPhase = ''
-    runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-    cp -R webapp $out
-    tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js
-    echo "${finalAttrs.version}" > "$out/version"
-    jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
+      cp -R webapp $out
+      tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js
+      echo "${finalAttrs.version}" > "$out/version"
+      jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
 
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Glossy Matrix collaboration client for the web";
-    homepage = "https://element.io/";
-    changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
-    maintainers = lib.teams.matrix.members;
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.all;
-  };
-})
+      runHook postInstall
+    '';
 
+    meta = {
+      description = "Glossy Matrix collaboration client for the web";
+      homepage = "https://element.io/";
+      changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
+      maintainers = lib.teams.matrix.members;
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.all;
+    };
+  }
+)

From 64b85b80e49d965f4fdd8a90cd4a88c4ff4a8438 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:02:55 -0300
Subject: [PATCH 4/5] element-web: add back conf override option

---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9cbdba067b0..cfc43e7f0993 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2290,6 +2290,10 @@ with pkgs;
 
   electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
 
+  element-web = callPackage ../by-name/el/element-web/package.nix {
+    conf = config.element-web.conf or { };
+  };
+
   elm-github-install = callPackage ../tools/package-management/elm-github-install { };
 
   espanso-wayland = espanso.override {

From 1d5dcb8bed58e95529fcf97b3b0987e82f1b720a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 19 Dec 2024 13:12:24 -0300
Subject: [PATCH 5/5] element-desktop: remove darwin frameworks, already part

of stdenv
---
 pkgs/by-name/el/element-desktop/keytar/default.nix | 9 +--------
 pkgs/by-name/el/element-desktop/package.nix        | 5 ++---
 pkgs/by-name/el/element-desktop/seshat/default.nix | 4 +---
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index 993bbcd2068f..4b9411b8f75f 100644
--- 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
index 1afb094d7e5a..f0f92cccb0df 100644
--- 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
index 800650ce5b66..5e3bb3f0aa07 100644
--- 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;