tools: make v8.nix more stable

Author: aduh95

shell.nix

@@ -47,7 +47,15 @@ let
 
   needsRustCompiler = withTemporal && !builtins.hasAttr "temporal_capi" sharedLibDeps;
 
-  buildInputs = builtins.attrValues sharedLibDeps ++ pkgs.lib.optional useSharedICU icu;
+  nativeBuildInputs =
+    pkgs.nodejs-slim_latest.nativeBuildInputs
+    ++ pkgs.lib.optionals needsRustCompiler [
+      pkgs.cargo
+      pkgs.rustc
+    ];
+  buildInputs = pkgs.lib.optional useSharedICU icu;
+
+  # Put here only the configure flags that affect the V8 build
   configureFlags = [
     (
       if icu == null then
@@ -57,47 +65,31 @@ let
     )
   ]
   ++ extraConfigFlags
-  ++ pkgs.lib.optional (!withAmaro) "--without-amaro"
-  ++ pkgs.lib.optional (!withLief) "--without-lief"
-  ++ pkgs.lib.optional withQuic "--experimental-quic"
-  ++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
-  ++ pkgs.lib.optional (!withSSL) "--without-ssl"
   ++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"
-  ++ pkgs.lib.optional (ninja != null) "--ninja"
-  ++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}"
   ++ pkgs.lib.concatMap (name: [
     "--shared-${name}"
-    "--shared-${name}-libpath=${pkgs.lib.getLib sharedLibDeps.${name}}/lib"
-    "--shared-${name}-include=${pkgs.lib.getInclude sharedLibDeps.${name}}/include"
   ]) (builtins.attrNames sharedLibDeps);
 in
 pkgs.mkShell {
-  inherit (pkgs.nodejs-slim_latest) nativeBuildInputs;
+  inherit nativeBuildInputs;
 
   buildInputs =
-    buildInputs
+    builtins.attrValues sharedLibDeps
+    ++ buildInputs
     ++ pkgs.lib.optional (useSeparateDerivationForV8 != false) (
       if useSeparateDerivationForV8 == true then
-        import ./tools/nix/v8.nix {
+        pkgs.callPackage ./tools/nix/v8.nix {
           inherit
-            pkgs
             configureFlags
             buildInputs
-            needsRustCompiler
+            nativeBuildInputs
             ;
         }
       else
         useSeparateDerivationForV8
     );
 
-  packages =
-    pkgs.lib.optional (ccache != null) ccache
-    ++ devTools
-    ++ benchmarkTools
-    ++ pkgs.lib.optionals needsRustCompiler [
-      pkgs.cargo
-      pkgs.rustc
-    ];
+  packages = devTools ++ benchmarkTools ++ pkgs.lib.optional (ccache != null) ccache;
 
   shellHook = pkgs.lib.optionalString (ccache != null) ''
     export CC="${pkgs.lib.getExe ccache} $CC"
@@ -118,7 +110,15 @@ pkgs.mkShell {
     ]
   );
   CONFIG_FLAGS = builtins.toString (
-    configureFlags ++ pkgs.lib.optional (useSeparateDerivationForV8 != false) "--without-bundled-v8"
+    configureFlags
+    ++ pkgs.lib.optional (ninja != null) "--ninja"
+    ++ pkgs.lib.optional (!withAmaro) "--without-amaro"
+    ++ pkgs.lib.optional (!withLief) "--without-lief"
+    ++ pkgs.lib.optional withQuic "--experimental-quic"
+    ++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
+    ++ pkgs.lib.optional (!withSSL) "--without-ssl"
+    ++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}"
+    ++ pkgs.lib.optional (useSeparateDerivationForV8 != false) "--without-bundled-v8"
   );
   NOSQLITE = pkgs.lib.optionalString (!withSQLite) "1";
 }

tools/nix/v8.nix

@@ -1,13 +1,21 @@
 # Derivation for Node.js CI (not officially supported for regular applications)
 {
-  pkgs ? import ./pkgs.nix { },
+  stdenv,
+  lib,
+  patchutils,
+  validatePkgConfig,
+  nodejs-slim_latest,
+
   buildInputs ? [ ],
   configureFlags ? [ ],
-  needsRustCompiler ? false,
+
+  configureScript ? nodejs-slim_latest.configureScript,
+  nativeBuildInputs ? nodejs-slim_latest.nativeBuildInputs,
+  patches ? nodejs-slim_latest.patches,
 }:
 
 let
-  nodejs = pkgs.nodejs-slim_latest;
+  v8Dir = ../../deps/v8;
 
   version =
     let
@@ -26,12 +34,12 @@ let
     else
       "${builtins.elemAt v8Version 0}.${builtins.elemAt v8Version 1}.${builtins.elemAt v8Version 2}.${builtins.elemAt v8Version 3}-${builtins.elemAt v8_embedder_string 0}";
 in
-pkgs.stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "v8";
   inherit version;
   src =
     let
-      inherit (pkgs.lib) fileset;
+      inherit (lib) fileset;
     in
     fileset.toSource {
       root = ../../.;
@@ -61,7 +69,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
   # We need to patch tools/gyp/ to work from within Nix sandbox
   prePatch = ''
     patches=()
-    for patch in ${pkgs.lib.concatStringsSep " " nodejs.patches}; do
+    for patch in ${lib.concatStringsSep " " patches}; do
       filtered=$(mktemp)
       filterdiff -p1 -i 'tools/gyp/*' "$patch" > "$filtered"
       if [ -s "$filtered" ]; then
@@ -70,26 +78,19 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  inherit (nodejs) configureScript;
-  inherit configureFlags buildInputs;
+  inherit configureScript configureFlags buildInputs;
 
-  nativeBuildInputs =
-    nodejs.nativeBuildInputs
-    ++ [
-      pkgs.patchutils
-      pkgs.validatePkgConfig
-    ]
-    ++ pkgs.lib.optionals needsRustCompiler [
-      pkgs.cargo
-      pkgs.rustc
-    ];
+  nativeBuildInputs = nativeBuildInputs ++ [
+    patchutils
+    validatePkgConfig
+  ];
 
   buildPhase = ''
     ninja -v -C out/Release v8_snapshot v8_libplatform
   '';
   installPhase = ''
     ${
-      if pkgs.stdenv.buildPlatform.isDarwin then
+      if stdenv.hostPlatform.isDarwin then
         # Darwin is excluded from creating thin archive in tools/gyp/pylib/gyp/generator/ninja.py:2488
         "install -Dm644 out/Release/lib* -t $out/lib"
       else