Get rid of 'static' parent dir for Wrinkl assets
commit60c53786db84c66a19e5c283de43969679bc9821
authorElliot Cameron <elliot.cameron@obsidian.systems>
dateThu 9 Jul 2020, 22:29 (6 years ago)
parent199798b
lib/executable-config/default.nix+3−2
@@ -5,13 +5,14 @@
55{ lib
66, runCommand
77, obeliskCleanSource
8+, staticDirName ? ""
89}:
910
1011let
1112 injectConfig = config: assets: runCommand "inject-config" {} (''
1213 set -x
13− mkdir -p $out
14− cp --no-preserve=mode -Lr "${assets}" $out/static
14+ mkdir -p "$out"/'${staticDirName}'
15+ cp --no-preserve=mode -Lr "${assets}"/. "$out"/'${staticDirName}'/
1516 chmod +w "$out"
1617 '' + lib.optionalString (!(builtins.isNull config)) ''
1718 if ! mkdir $out/config; then