WIP

Author: yvan-sraka

nix/ext/plv8.nix

@@ -14,11 +14,7 @@
 }:
 let
   # plv8 3.1 requires an older version of v8 (we cannot use nodejs.libv8)
-  node_pkgs = import (fetchTarball {
-    url = "https://github.com/nixos/nixpkgs/archive/a76c4553d7e741e17f289224eda135423de0491d.tar.gz";
-    sha256 = "0rwdzp942b8ay625lqgra83qrp64b3wqm6w9a0i4z593df8x822v";
-  }) { system = stdenv.system; };
-  inherit (node_pkgs) v8;
+  v8 = nodejs_20.libv8;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "plv8";
@@ -37,36 +33,33 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-build-Allow-using-V8-from-system.patch
   ];
 
-  nativeBuildInputs = [
-    perl
-  ]
-  ++ lib.optionals stdenv.isDarwin [
-    clang
-    xcbuild
-  ];
+  nativeBuildInputs =
+    [ perl ]
+    ++ lib.optionals stdenv.isDarwin [
+      clang
+      xcbuild
+    ];
 
   buildInputs = [
     v8
     postgresql
-  ]
-  ++ lib.optionals stdenv.isDarwin [
-    apple-sdk_11
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ];
 
   buildFlags = [ "all" ];
 
-  makeFlags = [
-    # Nixpkgs build a v8 monolith instead of separate v8_libplatform.
-    "USE_SYSTEM_V8=1"
-    "V8_OUTDIR=${v8}/lib"
-    "PG_CONFIG=${postgresql}/bin/pg_config"
-  ]
-  ++ lib.optionals stdenv.isDarwin [
-    "CC=${clang}/bin/clang"
-    "CXX=${clang}/bin/clang++"
-    "SHLIB_LINK=-L${v8}/lib -lv8_monolith -Wl,-rpath,${v8}/lib"
-  ]
-  ++ lib.optionals (!stdenv.isDarwin) [ "SHLIB_LINK=-lv8" ];
+  makeFlags =
+    [
+      # Nixpkgs build a v8 monolith instead of separate v8_libplatform.
+      "USE_SYSTEM_V8=1"
+      "V8_OUTDIR=${v8}/lib"
+      "PG_CONFIG=${postgresql}/bin/pg_config"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      "CC=${clang}/bin/clang"
+      "CXX=${clang}/bin/clang++"
+      "SHLIB_LINK=-L${v8}/lib -lv8_monolith -Wl,-rpath,${v8}/lib"
+    ]
+    ++ lib.optionals (!stdenv.isDarwin) [ "SHLIB_LINK=-lv8" ];
 
   NIX_LDFLAGS = (
     lib.optionals stdenv.isDarwin [
@@ -127,9 +120,11 @@ stdenv.mkDerivation (finalAttrs: {
         install_name_tool -change @rpath/libv8_monolith.dylib ${v8}/lib/libv8_monolith.dylib $out/lib/plv8.so
       ''}
 
-      ${lib.optionalString (!stdenv.isDarwin) ''
-        ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8.so
-      ''}
+      ${
+        lib.optionalString (!stdenv.isDarwin) ''
+          ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8.so
+        ''
+      }
     else
       ${lib.optionalString stdenv.isDarwin ''
         install_name_tool -add_rpath "${v8}/lib" $out/lib/plv8-${finalAttrs.version}${postgresql.dlSuffix}
@@ -138,9 +133,11 @@ stdenv.mkDerivation (finalAttrs: {
         install_name_tool -change @rpath/libv8_monolith.dylib ${v8}/lib/libv8_monolith.dylib $out/lib/plv8-${finalAttrs.version}${postgresql.dlSuffix}
       ''}
 
-      ${lib.optionalString (!stdenv.isDarwin) ''
-        ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8-${finalAttrs.version}${postgresql.dlSuffix}
-      ''}
+      ${
+        lib.optionalString (!stdenv.isDarwin) ''
+          ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8-${finalAttrs.version}${postgresql.dlSuffix}
+        ''
+      }
     fi
   '';
 

nix/ext/plv8/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  v8,
   perl,
   postgresql,
   # For passthru test on various systems, and local development on macos
@@ -36,15 +35,15 @@ let
     lib.mapAttrs (name: value: build name value.hash) supportedVersions
   );
 
+  v8 = nodejs_20.libv8;
+
   # Build function for individual versions
   build =
     version: hash:
     stdenv.mkDerivation (finalAttrs: {
       inherit pname version;
       #version = "3.1.10";
 
-      v8 = (if (builtins.compareVersions "3.1.10" version >= 0) then v8 else nodejs_20.libv8);
-
       src = fetchFromGitHub {
         owner = "plv8";
         repo = "plv8";

nix/postgresql/generic.nix

@@ -65,6 +65,8 @@ let
       # detection of crypt fails when using llvm stdenv, so we add it manually
       # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
       libxcrypt,
+
+      isOrioleDB ? false,
     }@args:
     let
       atLeast = lib.versionAtLeast version;