Publish quixos-nix-helpers from 8354a2e04f56eea0a647e878ca19c5398c1e1f89

.quixos-subtree-source.json

@@ -0,0 +1,8 @@
+{
+  "version": 1,
+  "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
+  "sourceCommit": "8354a2e04f56eea0a647e878ca19c5398c1e1f89",
+  "sourcePath": "quixos-instance/quixos-nix-helpers",
+  "exportName": "quixos-nix-helpers",
+  "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
+}

quixos-package-helpers.nix

@@ -521,6 +521,7 @@ EOF
       promptName ? null,
       nodejsAttr ? "nodejs_24",
       buildCommand ? "yarn build",
+      sourcePortals ? { },
       buildEnv ? { },
       nativeBuildInputs ? [ ],
       devShellPackages ? [ ],
@@ -560,6 +561,13 @@ EOF
               attrs
           );
 
+        portalLinksFor = attrs:
+          lib.concatStringsSep "\n" (
+            lib.mapAttrsToList
+              (target: source: "ln -sfn ${source} ${lib.escapeShellArg target}")
+              attrs
+          );
+
         bundleConfig = if bundle == null then { } else bundle;
         bundleOutfile = bundleConfig.outfile or "server.mjs";
         bundlePlatform = bundleConfig.platform or "node";
@@ -631,6 +639,9 @@ EOF
               (old.nativeBuildInputs or [ ])
               ++ lib.optional (bundle != null) pkgs.esbuild
               ++ callOption nativeBuildInputs;
+            preConfigure = (old.preConfigure or "") + ''
+              ${portalLinksFor (callOption sourcePortals)}
+            '';
             buildPhase = ''
               runHook preBuild
               ${exportsFor (callOption buildEnv)}
@@ -670,7 +681,7 @@ EOF
         devShells.default = pkgs.mkShell {
           packages = [
             nodejs
-            project.yarn-freestanding
+            pkgs.yarn-berry_4
           ] ++ callOption devShellPackages;
           shellHook = devShellHookBase + callOption devShellHook;
         };