nodejs
diff --git a/Collapse file
‎node.gyp‎
Copy file name to clipboardExpand all lines: node.gyp
+7-3Lines changed: 7 additions & 3 deletions b/Collapse file
‎node.gyp‎
Copy file name to clipboardExpand all lines: node.gyp
+7-3Lines changed: 7 additions & 3 deletions
diff --git a/Collapse file
‎node.gypi‎
Copy file name to clipboardExpand all lines: node.gypi
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎node.gypi‎
Copy file name to clipboardExpand all lines: node.gypi
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎tools/nix/v8.nix‎
Copy file name to clipboardExpand all lines: tools/nix/v8.nix
+9-13Lines changed: 9 additions & 13 deletions b/Collapse file
‎tools/nix/v8.nix‎
Copy file name to clipboardExpand all lines: tools/nix/v8.nix
+9-13Lines changed: 9 additions & 13 deletions
@@ -895,7 +895,6 @@
         '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
       ],
       'dependencies': [
-        'tools/v8_gypfiles/abseil.gyp:abseil',
         'node_js2c#host',
       ],
 
@@ -956,6 +955,9 @@
             'src/node_snapshot_stub.cc',
           ]
         }],
+        [ 'node_use_bundled_v8!="false"', {
+          'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
+        }],
         [ 'node_shared_gtest=="false"', {
           'dependencies': [
             'deps/googletest/googletest.gyp:gtest_prod',
@@ -1276,7 +1278,6 @@
 
       'dependencies': [
         '<(node_lib_target_name)',
-        'tools/v8_gypfiles/abseil.gyp:abseil',
       ],
 
       'includes': [
@@ -1310,6 +1311,9 @@
         [ 'node_shared_gtest=="true"', {
           'libraries': [ '-lgtest_main' ],
         }],
+        [ 'node_use_bundled_v8!="false"', {
+          'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
+        }],
         [ 'node_shared_hdr_histogram=="false"', {
           'dependencies': [
             'deps/histogram/histogram.gyp:histogram',
@@ -1548,7 +1552,7 @@
         [ 'OS=="mac"', {
           'libraries': [ '-framework CoreFoundation -framework Security' ],
         }],
-        [ 'node_shared_simdutf=="false"', {
+        [ 'node_shared_simdutf=="false" and node_use_bundled_v8!="false"', {
           'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
         }],
         [ 'node_shared_libuv=="false"', {
 
@@ -234,7 +234,7 @@
         'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
     }],
 
-    [ 'node_shared_simdutf=="false"', {
+    [ 'node_shared_simdutf=="false" and node_use_bundled_v8!="false"', {
         'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf' ],
     }],
 
 
@@ -8,6 +8,7 @@
 
 let
   nodejs = pkgs.nodejs-slim_latest;
+  v8Dir = ../../deps/v8;
 
   version =
     let
@@ -16,7 +17,7 @@ let
         + "#define V8_MINOR_VERSION ([0-9]+).*"
         + "#define V8_BUILD_NUMBER ([0-9]+).*"
         + "#define V8_PATCH_LEVEL ([0-9]+).*"
-      ) (builtins.readFile ../../deps/v8/include/v8-version.h);
+      ) (builtins.readFile "${v8Dir}/include/v8-version.h");
       v8_embedder_string = builtins.match ".*'v8_embedder_string': '-(node.[0-9]+)'.*" (
         builtins.readFile ../../common.gypi
       );
@@ -41,7 +42,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
         ../../configure.py
         ../../deps/inspector_protocol/inspector_protocol.gyp
         ../../deps/ncrypto/ncrypto.gyp
-        ../../deps/v8
+        v8Dir
         ../../node.gyp
         ../../node.gypi
         ../../src/inspector/node_inspector.gypi
@@ -86,7 +87,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
   '';
   installPhase = ''
     ${
-      if pkgs.stdenv.buildPlatform.isDarwin then
+      if pkgs.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
@@ -106,22 +107,17 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
           done
         ''
     }
-    libs=$(for f in $out/lib/lib*.a; do
-      b=$(basename "$f" .a)
-      printf " -l%s" "''${b#lib}"
-    done)
-
-    # copy v8 headers
-    cp -r deps/v8/include $out/
 
-    # create a pkgconfig file for v8
     mkdir -p $out/lib/pkgconfig
     cat -> $out/lib/pkgconfig/v8.pc << EOF
     Name: v8
     Description: V8 JavaScript Engine build for Node.js CI
     Version: ${version}
-    Libs: -L$out/lib $libs
-    Cflags: -I$out/include
+    Libs: -L$out/lib $(for f in $out/lib/lib*.a; do
+      b=$(basename "$f" .a)
+      printf " -l%s" "''${b#lib}"
+    done) -lstdc++
+    Cflags: -I${v8Dir}/include -I${v8Dir}/third_party/abseil-cpp -I${v8Dir}/third_party/simdutf
     EOF
   '';
 })