fixup! squash! pass same configure flags to sub derivation

Author: aduh95

node.gyp

@@ -659,14 +659,21 @@
                 ],
               },
             }],
-            ['OS != "aix" and OS != "os400" and OS != "mac" and OS != "ios"', {
+            ['node_use_bundled_v8=="true" and OS != "aix" and OS != "os400" and OS != "mac" and OS != "ios"', {
               'ldflags': [
                 '-Wl,--whole-archive',
                 '<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
                 '<(obj_dir)/tools/v8_gypfiles/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)',
                 '-Wl,--no-whole-archive',
               ],
             }],
+            ['node_use_bundled_v8!="true" and OS != "aix" and OS != "os400" and OS != "mac" and OS != "ios"', {
+              'ldflags': [
+                '-Wl,--whole-archive',
+                '<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
+                '-Wl,--no-whole-archive',
+              ],
+            }],
             [ 'OS=="win"', {
               'sources': [ 'src/res/node.rc' ],
             }],

shell.nix

@@ -112,7 +112,7 @@ pkgs.mkShell {
     ]
   );
   CONFIG_FLAGS = builtins.toString (
-    configureFlags ++ pkgs.lib.optional useSeparateDerivationForV8 "--without-bundled-v8"
+    configureFlags ++ pkgs.lib.optional (useSeparateDerivationForV8 != false) "--without-bundled-v8"
   );
   NOSQLITE = pkgs.lib.optionalString (!withSQLite) "1";
 }

tools/nix/v8.nix

@@ -88,7 +88,23 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
     ninja -v -C out/Release v8_snapshot v8_libplatform
   '';
   installPhase = ''
-    install -Dm644 out/Release/${pkgs.lib.optionalString (pkgs.stdenv.buildPlatform.isLinux) "obj/tools/v8_gypfiles/"}lib* -t $out/lib
+    ${
+      if pkgs.stdenv.buildPlatform.isDarwin then
+        # On Darwin, there are no thin archive
+        "install -Dm644 out/Release/lib* -t $out/lib"
+      else
+        ''
+        for a in out/Release/obj/tools/v8_gypfiles/lib*.a; do
+            name=$(basename "$a")
+            tmpdir=$(mktemp -d)
+            pushd "$tmpdir"
+            "$AR" x "$a"
+            "$AR" rcs "$out/lib/$name" *.o
+            popd
+            rm -rf "$tmpdir"
+        done
+        ''
+    }
     libs=$(for f in $out/lib/lib*.a; do
         b=$(basename "$f" .a)
         printf " -l%s" "''${b#lib}"