nodePackages.node-gyp: drop

NixOS · Aug 13, 2024 · 000f83e · 000f83e
1 parent d07c3c3
commit 000f83e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 170 deletions.
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
@@ -6,7 +6,7 @@
   nodejs,
   pnpm,
   python3,
-  nodePackages,
+  node-gyp,
   cacert,
   xcbuild,
   libkrb5,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pnpm.configHook
     python3 # required to build sqlite3 bindings
-    nodePackages.node-gyp # required to build sqlite3 bindings
+    node-gyp # required to build sqlite3 bindings
     cacert # required for rustls-native-certs (dependency of turbo build tool)
     makeWrapper
   ] ++ lib.optional stdenv.isDarwin [ xcbuild ];

diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -8,7 +8,7 @@
 , Security
 , AppKit
 , pkg-config
-, nodePackages
+, node-gyp
 , runCommand
 , vscode-js-debug
 , nix-update-script
@@ -29,7 +29,7 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-    nodePackages.node-gyp
+    node-gyp
   ] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
 
   buildInputs =

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
@@ -126,6 +126,7 @@ mapAliases {
   musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
   inherit (pkgs) near-cli; # added 2023-09-09
   node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) node-gyp; # added 2024-08-13
   inherit (pkgs) node-pre-gyp; # added 2024-08-05
   inherit (pkgs) nodemon; # added 2024-06-28
   inherit (pkgs) npm-check-updates; # added 2023-08-22

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
@@ -150,7 +150,6 @@
 , "multi-file-swagger"
 , "neovim"
 , "nijs"
-, "node-gyp"
 , "node-gyp-build"
 , "node-red"
 , "node2nix"

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
@@ -168,16 +168,6 @@ final: prev: {
     '';
   };
 
-  node-gyp = prev.node-gyp.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org.
-    # This is important when build nodejs packages in sandbox.
-    postInstall = ''
-      wrapProgram "$out/bin/node-gyp" \
-        --set npm_config_nodedir ${nodejs}
-    '';
-  };
-
   node-red = prev.node-red.override {
     buildInputs = [ pkgs.node-pre-gyp ];
   };

diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix
@@ -3,7 +3,7 @@
 , darwin
 , fetchFromGitHub
 , lib
-, nodePackages
+, node-gyp
 , nodejs
 , python3
 , stdenv
@@ -31,7 +31,7 @@ buildNpmPackage {
   npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
-  nativeBuildInputs = [ nodePackages.node-gyp python3 ]
+  nativeBuildInputs = [ node-gyp python3 ]
     ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   postInstall = ''

diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix
@@ -5,7 +5,7 @@
 , fetchFromGitHub
 , testers
 , balena-cli
-, nodePackages
+, node-gyp
 , python3
 , udev
 , cctools
@@ -36,7 +36,7 @@ in buildNpmPackage' rec {
   makeCacheWritable = true;
 
   nativeBuildInputs = [
-    nodePackages.node-gyp
+    node-gyp
     python3
   ] ++ lib.optionals stdenv.isDarwin [
     cctools

diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix
@@ -2,7 +2,7 @@
 , lib
 , makeWrapper
 , nodejs
-, nodePackages
+, node-gyp
 , pnpm_9
 , python3
 , stdenv
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     nodejs
-    nodePackages.node-gyp # required for sqlite3 bindings
+    node-gyp # required for sqlite3 bindings
     pnpm_9.configHook
     python3 # required for sqlite3 bindings
   ] ++ lib.optional stdenv.isDarwin [ xcbuild ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -34455,13 +34455,11 @@ with pkgs;
   openvscode-server = callPackage ../servers/openvscode-server {
     nodejs = nodejs_18;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
-    inherit (nodePackages) node-gyp;
   };
 
   code-server = callPackage ../servers/code-server {
     nodejs = nodejs_20;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
-    inherit (nodePackages) node-gyp;
   };
 
   vue = callPackage ../applications/misc/vue { };