git.iko.soy/obelisk
on master help sign in
skeleton: Rename generated static module and pkg name
commitcba595745fb33b355393a9e5afe54198d244f2fa authorLuigy Leon <Luigy.Leon@Obsidian.Systems> dateTue 11 Sep 2018, 14:50 (8 years ago) parent7ca9e47
3 files changed+4−4
compare with master
unifiedsplit
default.nix+1−1 skeleton/frontend/frontend.cabal+2−2 skeleton/frontend/src/Frontend.hs+1−1
default.nix+1−1
@@ -161,7 +161,7 @@ rec {
161161 nullIfAbsent = p: if pathExists p then p else null;
162162 haskellOverrides = addLibs;
163163 #TODO: Avoid copying files within the nix store. Right now, obelisk-asset-manifest-generate copies files into a big blob so that the android/ios static assets can be imported from there; instead, we should get everything lined up right before turning it into an APK, so that copies, if necessary, only exist temporarily.
164− processAssets = { src, packageName ? "static", moduleName ? "Static" }: pkgs.runCommand "asset-manifest" {
164+ processAssets = { src, packageName ? "obelisk-generated-static", moduleName ? "Obelisk.Generated.Static" }: pkgs.runCommand "asset-manifest" {
165165 inherit src;
166166 outputs = [ "out" "haskellManifest" "symlinked" ];
167167 buildInputs = [
skeleton/frontend/frontend.cabal+2−2
@@ -8,7 +8,7 @@ library
88 build-depends: base
99 , common
1010 , reflex-dom
11− , static
11+ , obelisk-generated-static
1212 , text
1313 exposed-modules:
1414 Frontend
@@ -20,7 +20,7 @@ executable frontend
2020 build-depends: base
2121 , common
2222 , reflex-dom
23− , static
23+ , obelisk-generated-static
2424 , text
2525 , frontend
2626 --TODO: Make these ghc-options optional
skeleton/frontend/src/Frontend.hs+1−1
@@ -7,7 +7,7 @@ import qualified Data.Text as T
77import Reflex.Dom.Core
88
99import Common.Api
10−import Static
10+import Obelisk.Generated.Static
1111
1212frontend :: (StaticWidget x (), Widget x ())
1313frontend = (head', body)