From e95ea5544fe494f5ff62bd260d516af15ab5ba05 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Mar 2025 14:21:59 +0100
Subject: [PATCH 1/2] element-web: use yarnConfigHook

---
 .../el/element-web-unwrapped/package.nix      | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index b03d2a2c79a8..22c01011aa96 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   jq,
-  yarn,
-  fixup-yarn-lock,
+  yarnConfigHook,
   nodejs,
   jitsi-meet,
 }:
@@ -36,8 +35,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
-      fixup-yarn-lock
+      yarnConfigHook
       jq
       nodejs
     ];
@@ -53,25 +51,6 @@ stdenv.mkDerivation (
       runHook postBuild
     '';
 
-    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
-
-      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
-    '';
-
     installPhase = ''
       runHook preInstall
 

From 15fd40ac1338621c057f33f4d8261902517347f9 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Mar 2025 14:18:32 +0100
Subject: [PATCH 2/2] element-desktop: use yarnConfigHook

---
 pkgs/by-name/el/element-desktop/package.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index e231764e59bd..6e47fe087994 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  fixup-yarn-lock,
-  yarn,
+  yarnConfigHook,
   nodejs,
   fetchYarnDeps,
   jq,
@@ -48,8 +47,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
-      fixup-yarn-lock
+      yarnConfigHook
       nodejs
       makeWrapper
       jq
@@ -57,18 +55,6 @@ stdenv.mkDerivation (
 
     inherit seshat;
 
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$(mktemp -d)
-      yarn config --offline set yarn-offline-mirror $offlineCache
-      fixup-yarn-lock yarn.lock
-      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules/
-
-      runHook postConfigure
-    '';
-
     # Only affects unused scripts in $out/share/element/electron/scripts. Also
     # breaks because there are some `node`-scripts with a `npx`-shebang and
     # this shouldn't be in the closure just for unused scripts.