@@ -5,8 +5,8 @@
55let
66 getReflexPlatform = sys: import ./dep/reflex-platform { inherit iosSdkVersion; system = sys; };
77 reflex-platform = getReflexPlatform system;
8− inherit (reflex-platform) hackGet;
9− pkgs = reflex-platform.nixpkgs;
8+ inherit (reflex-platform) hackGet nixpkgs;
9+ pkgs = nixpkgs;
1010in with pkgs.haskell.lib; with pkgs.lib;
1111let
1212 # TODO: Remove this after updating nixpkgs: https://github.com/NixOS/nixpkgs/issues/37750
@@ -249,8 +249,9 @@ rec {
249249
250250 # An Obelisk project is a reflex-platform project with a predefined layout and role for each component
251251 project = base: projectDefinition:
252− let assets = processAssets { src = base + "/static"; };
253− configPath = base + "/config";
252+ let configPath = base + "/config";
253+ static = base + "/static";
254+ processedStatic = processAssets { src = static; };
254255 projectOut = sys: (getReflexPlatform sys).project (args@{ nixpkgs, ... }:
255256 let mkProject = { android ? null #TODO: Better error when missing
256257 , ios ? null #TODO: Better error when missing
@@ -274,7 +275,7 @@ rec {
274275 };
275276 combinedPackages = predefinedPackages // packages;
276277 projectOverrides = self: super: {
277− ${staticName} = dontHaddock (self.callCabal2nix "static" assets.haskellManifest {});
278+ ${staticName} = dontHaddock (self.callCabal2nix "static" processedStatic.haskellManifest {});
278279 ${backendName} = addBuildDepend super.${backendName} self.obelisk-run;
279280 };
280281 totalOverrides = composeExtensions (composeExtensions defaultHaskellOverrides projectOverrides) overrides;
@@ -296,19 +297,18 @@ rec {
296297 android = {
297298 ${if android == null then null else frontendName} = {
298299 executableName = "frontend";
299− ${if builtins.pathExists staticPath then "assets" else null} = assets.symlinked;
300+ ${if builtins.pathExists staticPath then "assets" else null} = processedStatic.symlinked;
300301 } // android;
301302 };
302303 ios = {
303304 ${if ios == null then null else frontendName} = {
304305 executableName = "frontend";
305− ${if builtins.pathExists staticPath then "staticSrc" else null} = assets.symlinked;
306+ ${if builtins.pathExists staticPath then "staticSrc" else null} = processedStatic.symlinked;
306307 } // ios;
307308 };
308309 };
309310 in mkProject (projectDefinition args));
310− serverOn = sys:
311− serverExe (projectOut sys).ghc.backend (projectOut system).ghcjs.frontend assets.symlinked configPath;
311+ serverOn = sys: serverExe (projectOut sys).ghc.backend (projectOut system).ghcjs.frontend static configPath;
312312 linuxExe = serverOn "x86_64-linux";
313313 in projectOut system // {
314314 inherit linuxExe;