Unverified Commit af31201a authored by Antoine du Hamel's avatar Antoine du Hamel Committed by GitHub
Browse files

treewide: fix mentions for nodejs.python (#505334)

parents 75082b71 201ccf89
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  fetchNpmDeps,
  nodejs,
  nodejs-slim,
  npmHooks,
  pkg-config,
  libsecret,
@@ -38,7 +39,7 @@ let
    ];
    nativeBuildInputs = [
      nodejs
      nodejs.python
      nodejs-slim.python
      npmHooks.npmConfigHook
    ]
    ++ lib.optionals stdenv.isLinux [
+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@
  fetchNpmDeps,
  libsecret,
  nodejs,
  nodejs-slim,
  npmHooks,
  pkg-config,
  clang_20,
@@ -37,7 +38,7 @@ let

    nativeBuildInputs = [
      nodejs
      nodejs.python
      nodejs-slim.python
      npmHooks.npmConfigHook
    ]
    ++ lib.optionals stdenv.isLinux [
+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
  fetchNpmDeps,
  buildPackages,
  nodejs,
  nodejs-slim,
  cctools,
}@topLevelArgs:

@@ -101,7 +102,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.python
          nodejs-slim.python
        ]
        ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
      buildInputs = buildInputs ++ [ nodejs ];
+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  clang_20,
  fetchFromGitHub,
  libsecret,
  nodejs,
  nodejs-slim,
  pkg-config,
}:

@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {

  nativeBuildInputs = [
    pkg-config
    nodejs.python
    nodejs-slim.python
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  fetchPnpmDeps,
  electron_40,
  nodejs,
  nodejs-slim,
  pnpm_10_29_2,
  pnpmConfigHook,
  makeWrapper,
@@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
  };

  nativeBuildInputs = [
    nodejs
    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
    nodejs-slim
    (nodejs-slim.python.withPackages (ps: with ps; [ setuptools ]))
    pnpm
    pnpmConfigHook
    makeWrapper
Loading