Include homepage_private static files.

This commit is contained in:
Tom Alexander
2026-07-13 21:05:07 -04:00
parent d523c7c7a4
commit f95fb5611a
2 changed files with 8 additions and 9 deletions

View File

@@ -84,12 +84,18 @@
homepage = final.lib.makeScope final.newScope ( homepage = final.lib.makeScope final.newScope (
homepageScope: homepageScope:
let let
homepage_private = fetchGit {
url = "git@code.fizz.buzz:talexander/homepage_private.git";
ref = "main";
rev = "89ba9628bf3e596345bc83f59cef5a2943584894";
};
natter' = (natter.overlays.default final final).natter.release; natter' = (natter.overlays.default final final).natter.release;
organic_ast_explorer' = organic_ast_explorer' =
(organic_ast_explorer.overlays.default final final).organic_ast_explorer.release; (organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;
release = homepageScope.callPackage ./nix/package.nix { release = homepageScope.callPackage ./nix/package.nix {
natter = natter'; natter = natter';
organic_ast_explorer = organic_ast_explorer'; organic_ast_explorer = organic_ast_explorer';
inherit homepage_private;
}; };
nginx_conf = final.replaceVars "${./docker/server/nginx.conf}" { nginx_conf = final.replaceVars "${./docker/server/nginx.conf}" {
web_root = release; web_root = release;

View File

@@ -1,9 +1,9 @@
{ {
hello,
lib, lib,
pkgs, pkgs,
natter, natter,
organic_ast_explorer, organic_ast_explorer,
homepage_private,
}: }:
let let
@@ -14,19 +14,12 @@ pkgs.stdenv.mkDerivation rec {
src = lib.cleanSource ../.; src = lib.cleanSource ../.;
nativeBuildInputs = [
# pkgs.simgrid
# pkgs.boost
# pkgs.cmake
];
configurePhase = ""; configurePhase = "";
# TODO copy COPY --link --from=private /homepage_private/static /source/static/
buildPhase = '' buildPhase = ''
mkdir -p static/organic/ast_explorer mkdir -p static/organic/ast_explorer
cp ${organic_ast_explorer}/* static/organic/ast_explorer/ cp ${organic_ast_explorer}/* static/organic/ast_explorer/
cp -r ${homepage_private}/static/* static/
${natter}/bin/natter build --config natter.toml ${natter}/bin/natter build --config natter.toml
''; '';