8e93cf3 · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge pull request #288 from obsidiansystems/static-files-enhancements

ob run: serve assets from local staticFiles path

commit8e93cf384f27566e7a9e6c3f9691c50d77797dab authorLuigy Leon <luichi.19@gmail.com> dateTue 30 Oct 2018, 15:51 (8 years ago) parent876394d 089624b

2 files changed+3−3

unifiedsplit

default.nix+1−1

@@ -154,7 +154,7 @@ in rec {

154154 set -euo pipefail

155155 touch "$out"

156156 mkdir -p "$symlinked"

157− obelisk-asset-manifest-generate "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"

157+ obelisk-asset-manifest-generate "$src" "${builtins.toString src}" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"

158158 '';

159159

160160 compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" { buildInputs = [ pkgs.closurecompiler ]; } ''

lib/asset/manifest/src-bin/generate.hs+2−2

@@ -7,11 +7,11 @@ import System.Environment

77main :: IO ()

88main = do

99 --TODO: Usage

10− [root, haskellTarget, packageName, moduleName, fileTarget] <- getArgs

10+ [root, rootLocalPath, haskellTarget, packageName, moduleName, fileTarget] <- getArgs

1111 paths <- gatherHashedPaths root

1212 writeStaticProject paths haskellTarget $ StaticConfig

1313 { _staticConfig_packageName = T.pack packageName

1414 , _staticConfig_moduleName = T.pack moduleName

15− , _staticConfig_rootPath = root

15+ , _staticConfig_rootPath = rootLocalPath

1616 }

1717 copyAndSymlink paths root fileTarget