From 725d352b33beef94347a1e1a8ad242f5d4e6b80c Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Wed, 20 Sep 2023 10:52:18 -0400 Subject: [PATCH] Fix site.hs issue, switch back to PROJECT_ROOT const --- nixos-apps/cutesealfanpage.love.nix | 10 ++-------- nixos-apps/cutesealfanpage.love/flake.nix | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/nixos-apps/cutesealfanpage.love.nix b/nixos-apps/cutesealfanpage.love.nix index 2fba9f5..b5769ed 100644 --- a/nixos-apps/cutesealfanpage.love.nix +++ b/nixos-apps/cutesealfanpage.love.nix @@ -26,12 +26,9 @@ in git ]; script = '' - cd /workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love + cd ${PROJECT_ROOT}/cutesealfanpage.love nix run .#hakyll-site -- watch --no-server ''; - # serviceConfig = { - # ExecStart = "cd /workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love; ./hakyll-site"; - # }; }; cutesealfanpage-generatePosts = { @@ -43,12 +40,9 @@ in git ]; script = '' - cd /workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love + cd ${PROJECT_ROOT}/cutesealfanpage.love nix run .#generateSealPosts ''; - # serviceConfig = { - # ExecStart = "cd /workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love; ./generatePosts"; - # }; }; }; diff --git a/nixos-apps/cutesealfanpage.love/flake.nix b/nixos-apps/cutesealfanpage.love/flake.nix index 617176c..a4886f6 100644 --- a/nixos-apps/cutesealfanpage.love/flake.nix +++ b/nixos-apps/cutesealfanpage.love/flake.nix @@ -41,7 +41,7 @@ -O2 \ -static \ -o site \ - site.hs + ./site.hs ''; installPhase = "mkdir -p $out/bin; install -t $out/bin site"; };