cf74ee2 · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge pull request #388 from obsidiansystems/km-fix-mobile-assets

Fix mobile asset injection in default builds

commitcf74ee25bc0c95355600cf0f7f99649b8b590a4d authorAli Abrar <aliabrar@gmail.com> dateFri 29 Mar 2019, 23:13 (8 years ago) parent8612cca df3d931

1 file changed+6−4

unifiedsplit

default.nix+6−4

@@ -304,16 +304,18 @@ in rec {

304304 ${if android == null then null else frontendName} = {

305305 executableName = "frontend";

306306 ${if builtins.pathExists staticFiles then "assets" else null} =

307− (if configPath == null then lib.id else nixpkgs.obeliskExecutableConfig.platforms.android.inject (injectableConfig configPath))

308− processedStatic.symlinked;

307+ nixpkgs.obeliskExecutableConfig.platforms.android.inject

308+ (if configPath == null then null else injectableConfig configPath)

309+ processedStatic.symlinked;

309310 } // android;

310311 };

311312 __ios = configPath: {

312313 ${if ios == null then null else frontendName} = {

313314 executableName = "frontend";

314315 ${if builtins.pathExists staticFiles then "staticSrc" else null} =

315− (if configPath == null then lib.id else nixpkgs.obeliskExecutableConfig.platforms.ios.inject (injectableConfig configPath))

316− processedStatic.symlinked;

316+ nixpkgs.obeliskExecutableConfig.platforms.ios.inject

317+ (if configPath == null then null else injectableConfig configPath)

318+ processedStatic.symlinked;

317319 } // ios;

318320 };

319321 in {