fixup! tools: cache V8 on test-shared workflow

Author: aduh95

node.gyp

@@ -641,7 +641,6 @@
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
-              '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)',
             ],
           },
           'msvs_settings': {
@@ -653,6 +652,13 @@
             },
           },
           'conditions': [
+            ['node_use_bundled_v8=="true"', {
+              'xcode_settings': {
+                'OTHER_LDFLAGS': [
+                  '-Wl,-force_load,<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)',
+                ],
+              }
+            }]
             ['OS != "aix" and OS != "os400" and OS != "mac" and OS != "ios"', {
               'ldflags': [
                 '-Wl,--whole-archive',
@@ -1530,6 +1536,9 @@
         'src/builtin_info.cc',
       ],
       'conditions': [
+        [ 'OS=="mac"', {
+          'libraries': [ '-framework CoreFoundation -framework Security' ],
+        }],
         [ 'node_shared_simdutf=="false"', {
           'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
         }],

tools/nix/configureFlags.nix

@@ -44,7 +44,7 @@ in
 ++ 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.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ../..}"
 ++ pkgs.lib.concatMap (name: [
   "--shared-${name}"
   "--shared-${name}-libpath=${pkgs.lib.getLib sharedLibDeps.${name}}/lib"

tools/nix/sharedLibDeps.nix

@@ -15,7 +15,7 @@
     merve
     nbytes
     simdjson
-    simdutf
+    # simdutf
     uvwasi
     zlib
     zstd

tools/nix/v8.nix

@@ -83,21 +83,25 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ icu ] ++ builtins.attrValues sharedLibDeps;
 
   buildPhase = ''
-    ninja -C out/Release v8_snapshot v8_libplatform
+    ninja -v -C out/Release v8_snapshot v8_libplatform
   '';
   installPhase = ''
-    install -Dm644 out/Release/libabseil.* out/Release/libhighway.* out/Release/libv8_* -t $out/lib
+    install -Dm644 out/Release/lib* -t $out/lib
+    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
+    cat -> $out/lib/pkgconfig/v8.pc << EOF
     Name: v8
     Description: V8 JavaScript Engine
     Version: ${version}
-    Libs: -L$out/lib -labseil -lhighway -lv8_base_without_compiler -lv8_compiler -lv8_init -lv8_initializers -lv8_initializers_slow -lv8_libbase -lv8_libplatform -lv8_snapshot -lv8_zlib
+    Libs: -L$out/lib $libs
     Cflags: -I$out/include
     EOF
   '';