diff --git a/examples/quickstart/default.nix b/examples/quickstart/default.nix index e1d963a..f8052e4 100644 --- a/examples/quickstart/default.nix +++ b/examples/quickstart/default.nix @@ -8,10 +8,6 @@ # maybe don't do this but its possible to reference _any file_. defaultLayout = ./layouts/default.html; - # this could technically be a raw path; but nix doesn't keep directory name the same. - # use best judgement. - staticAssets = [ "./static" ]; - markdollPlugins = let sPoNgEbOb = pkgs.buildGoModule { name = "sPoNgEbOb"; @@ -32,6 +28,5 @@ (pkgs.mkMarkdollPlugin "plural" ./plugins/plural.sh) ((pkgs.mkMarkdollPlugin "tools" ./plugins/tools.py).override { buildInputs = [ pkgs.python3 ]; }) (pkgs.mkMarkdollPlugin "sPoNgEbOb" sPoNgEbOb) - # if your scripts need other things in path, they're sometimes best put here too. ]; } \ No newline at end of file diff --git a/examples/quickstart/index.doll b/examples/quickstart/index.doll index 4379f74..95ad0f4 100644 --- a/examples/quickstart/index.doll +++ b/examples/quickstart/index.doll @@ -15,6 +15,4 @@ this is markdoll! [img(https://codeberg.org/0x57e11a/markdoll/raw/branch/main/button.png):: alt text goes here (88x31 button that says MADE WITH MARKDOLL) - ] - - [img(/static/noe-pat.gif):noe being patted] \ No newline at end of file + ] \ No newline at end of file diff --git a/examples/quickstart/static/noe-pat.gif b/examples/quickstart/static/noe-pat.gif deleted file mode 100644 index e5839c6..0000000 Binary files a/examples/quickstart/static/noe-pat.gif and /dev/null differ diff --git a/pkgs/brewTea.nix b/pkgs/brewTea.nix index c7e294a..ecaa8e9 100644 --- a/pkgs/brewTea.nix +++ b/pkgs/brewTea.nix @@ -120,11 +120,9 @@ in pkgs.stdenvNoCC.mkDerivation { render_final $file $outFile $outFile.tmp.render done - echo ">>> STATIC ASSETS" - ${pkgs.lib.concatStrings (map (path: "cp -rv ${path} dist/\n") staticAssets)} ''; installPhase = '' cp -rv dist $out - ''; + '' + pkgs.lib.concatString (map path: "cp -rv ${path} $out/${path}; " staticAssets); } \ No newline at end of file