treewide: remove double dependencies on nodejs+nodejs-slim (#522606)

This commit is contained in:
Philip Taron
2026-05-28 17:17:28 +00:00
committed by GitHub
6 changed files with 11 additions and 13 deletions
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
fetchNpmDeps,
nodejs,
nodejs-slim,
npmHooks,
pkg-config,
@@ -38,7 +37,8 @@ let
libsecret
];
nativeBuildInputs = [
nodejs
nodejs-slim
nodejs-slim.npm
nodejs-slim.python
npmHooks.npmConfigHook
]
@@ -4,7 +4,6 @@
fetchFromGitHub,
fetchNpmDeps,
libsecret,
nodejs,
nodejs-slim,
npmHooks,
pkg-config,
@@ -37,7 +36,8 @@ let
];
nativeBuildInputs = [
nodejs
nodejs-slim
nodejs-slim.npm
nodejs-slim.python
npmHooks.npmConfigHook
]
@@ -4,7 +4,6 @@
fetchNpmDeps,
buildPackages,
nodejs,
nodejs-slim,
cctools,
}@topLevelArgs:
@@ -102,7 +101,7 @@ lib.extendMkDerivation {
(if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook)
(if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook)
(if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
nodejs-slim.python
nodejs.python
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
buildInputs = buildInputs ++ [ nodejs ];
@@ -9,7 +9,6 @@
nix-prefetch-git,
fetchurl,
jq,
nodejs,
nodejs-slim,
prefetch-yarn-deps,
fixup-yarn-lock,
+4 -4
View File
@@ -14,7 +14,6 @@
darwin,
makeDesktopItem,
makeWrapper,
nodejs,
nodejs-slim,
removeReferencesTo,
yarnBuildHook,
@@ -151,7 +150,8 @@ stdenv.mkDerivation (finalAttrs: {
copyDesktopItems
fakeGit
makeWrapper
nodejs
nodejs-slim
nodejs-slim.npm
(nodejs-slim.python.withPackages (ps: [ ps.setuptools ]))
removeReferencesTo
yarnBuildHook
@@ -200,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
yarn --offline --cwd tldraw postinstall
export npm_config_nodedir=${nodejs}
export npm_config_nodedir=${nodejs-slim}
pushd packages/amplify
npm rebuild --verbose
popd
@@ -247,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
# remove references to nodejs
find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs-slim} '{}' \;
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 static/icons/logseq.png "$out/share/icons/hicolor/512x512/apps/logseq.png"
@@ -25,11 +25,11 @@ let
nodejs = nodejs_20;
};
yarnConfigHook' = yarnConfigHook.override {
nodejs = nodejs_20;
nodejs-slim = nodejs_20;
yarn = yarn';
};
yarnBuildHook' = yarnBuildHook.override {
nodejs = nodejs_20;
nodejs-slim = nodejs_20;
yarn = yarn';
};
matrix-sdk-crypto-nodejs' = matrix-sdk-crypto-nodejs.override {