diff --git a/.quixos-subtree-source.json b/.quixos-subtree-source.json index fe1353b..1633216 100644 --- a/.quixos-subtree-source.json +++ b/.quixos-subtree-source.json @@ -1,7 +1,7 @@ { "version": 1, "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git", - "sourceCommit": "fa363fa2f4e83d0996c1229ab1ecf9e0541d5d4f", + "sourceCommit": "b384206b9c01a9ac50030a583d028b71291bc8c5", "sourcePath": "quixos-instance/quixos-nix-helpers", "exportName": "quixos-nix-helpers", "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git" diff --git a/quixos-package-helpers.nix b/quixos-package-helpers.nix index 44e9c5b..4a593b1 100644 --- a/quixos-package-helpers.nix +++ b/quixos-package-helpers.nix @@ -611,6 +611,15 @@ EOF else '' runHook preInstall 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} mkdir -p "$out/bin" cat > "$out/bin/${serverBin}" <