Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b6cd2f3cd7 | |||
| 2f66f25153 | |||
| 2ee30c177c | |||
| 7177130c03 | |||
| 1965741625 | |||
| 220aaaa08c | |||
| 56bbcd22d1 | |||
| bb57488dbc |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
|
"sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
|
||||||
"sourceCommit": "8354a2e04f56eea0a647e878ca19c5398c1e1f89",
|
"sourceCommit": "b384206b9c01a9ac50030a583d028b71291bc8c5",
|
||||||
"sourcePath": "quixos-instance/quixos-nix-helpers",
|
"sourcePath": "quixos-instance/quixos-nix-helpers",
|
||||||
"exportName": "quixos-nix-helpers",
|
"exportName": "quixos-nix-helpers",
|
||||||
"mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
|
"mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
|
||||||
|
|||||||
+10
-12
@@ -521,7 +521,6 @@ EOF
|
|||||||
promptName ? null,
|
promptName ? null,
|
||||||
nodejsAttr ? "nodejs_24",
|
nodejsAttr ? "nodejs_24",
|
||||||
buildCommand ? "yarn build",
|
buildCommand ? "yarn build",
|
||||||
sourcePortals ? { },
|
|
||||||
buildEnv ? { },
|
buildEnv ? { },
|
||||||
nativeBuildInputs ? [ ],
|
nativeBuildInputs ? [ ],
|
||||||
devShellPackages ? [ ],
|
devShellPackages ? [ ],
|
||||||
@@ -561,13 +560,6 @@ EOF
|
|||||||
attrs
|
attrs
|
||||||
);
|
);
|
||||||
|
|
||||||
portalLinksFor = attrs:
|
|
||||||
lib.concatStringsSep "\n" (
|
|
||||||
lib.mapAttrsToList
|
|
||||||
(target: source: "ln -sfn ${source} ${lib.escapeShellArg target}")
|
|
||||||
attrs
|
|
||||||
);
|
|
||||||
|
|
||||||
bundleConfig = if bundle == null then { } else bundle;
|
bundleConfig = if bundle == null then { } else bundle;
|
||||||
bundleOutfile = bundleConfig.outfile or "server.mjs";
|
bundleOutfile = bundleConfig.outfile or "server.mjs";
|
||||||
bundlePlatform = bundleConfig.platform or "node";
|
bundlePlatform = bundleConfig.platform or "node";
|
||||||
@@ -619,6 +611,15 @@ EOF
|
|||||||
else ''
|
else ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
install -Dm755 ${lib.escapeShellArg serverFile} "$out/libexec/${serverLibexecName}/${serverFile}"
|
install -Dm755 ${lib.escapeShellArg serverFile} "$out/libexec/${serverLibexecName}/${serverFile}"
|
||||||
|
# Browser entrypoints are runtime artifacts too. Package build scripts
|
||||||
|
# conventionally emit them as top-level .mjs files in dist/. Install
|
||||||
|
# the complete set so adding an entrypoint cannot produce a descriptor
|
||||||
|
# that resolves successfully but fails when Web Studio opens the file.
|
||||||
|
for browserModule in dist/*.mjs; do
|
||||||
|
if [ -f "$browserModule" ]; then
|
||||||
|
install -Dm644 "$browserModule" "$out/libexec/${serverLibexecName}/$(basename "$browserModule")"
|
||||||
|
fi
|
||||||
|
done
|
||||||
${lib.concatMapStringsSep "\n" installExtraFile extraFiles}
|
${lib.concatMapStringsSep "\n" installExtraFile extraFiles}
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
cat > "$out/bin/${serverBin}" <<EOF
|
cat > "$out/bin/${serverBin}" <<EOF
|
||||||
@@ -639,9 +640,6 @@ EOF
|
|||||||
(old.nativeBuildInputs or [ ])
|
(old.nativeBuildInputs or [ ])
|
||||||
++ lib.optional (bundle != null) pkgs.esbuild
|
++ lib.optional (bundle != null) pkgs.esbuild
|
||||||
++ callOption nativeBuildInputs;
|
++ callOption nativeBuildInputs;
|
||||||
preConfigure = (old.preConfigure or "") + ''
|
|
||||||
${portalLinksFor (callOption sourcePortals)}
|
|
||||||
'';
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
${exportsFor (callOption buildEnv)}
|
${exportsFor (callOption buildEnv)}
|
||||||
@@ -681,7 +679,7 @@ EOF
|
|||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
nodejs
|
nodejs
|
||||||
pkgs.yarn-berry_4
|
project.yarn-freestanding
|
||||||
] ++ callOption devShellPackages;
|
] ++ callOption devShellPackages;
|
||||||
shellHook = devShellHookBase + callOption devShellHook;
|
shellHook = devShellHookBase + callOption devShellHook;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user