From eb3e42ea5f36d0932baad06a2e5358010c9ca60c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 03:46:24 +0200 Subject: [PATCH 1/2] element-web: remove unused nodejs buildInput --- .../networking/instant-messengers/element/element-web.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 0049ccd6a33d..3b4394604598 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -7,7 +7,6 @@ , jq , yarn , fixup_yarn_lock -, nodejs , jitsi-meet , conf ? { } }: From a4802cfcbf6f96b9dec4e6f64f14e7a04956e129 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 13:31:01 +0200 Subject: [PATCH 2/2] element-desktop: use nodejs 16 (default) for dependencies --- .../instant-messengers/element/keytar/default.nix | 6 +++--- .../instant-messengers/element/seshat/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 9d46657e0ab5..550d01695ca0 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo +{ lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let @@ -15,12 +15,12 @@ in stdenv.mkDerivation rec { sha256 = pinData.srcHash; }; - nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ] + nativeBuildInputs = [ nodejs python3 yarn pkg-config ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; - npm_config_nodedir = nodejs-14_x; + npm_config_nodedir = nodejs; yarnOfflineCache = fetchYarnDeps { yarnLock = ./yarn.lock; diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 3c4ac2f52ae1..97d6a7d5204a 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -16,10 +16,10 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "source/seshat-node/native"; - nativeBuildInputs = [ nodejs-14_x python3 yarn ]; + nativeBuildInputs = [ nodejs python3 yarn ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; - npm_config_nodedir = nodejs-14_x; + npm_config_nodedir = nodejs; yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/seshat-node/yarn.lock";