git.iko.soy/obelisk
on master help sign in
Rename __ios/__android to make difference in type from ios/android more clear
8a8fc62Ken Micklas
default.nix+5−5
compare with master
unifiedsplit
@@ -299,7 +299,7 @@ in rec {
299 injectableConfig = builtins.filterSource (path: _:
299 injectableConfig = builtins.filterSource (path: _:
300 !(lib.lists.any (x: hasPrefix (toString base + "/" + toString x) (toString path)) privateConfigDirs)
300 !(lib.lists.any (x: hasPrefix (toString base + "/" + toString x) (toString path)) privateConfigDirs)
301 );
301 );
302− __android = configPath: {
302+ __androidWithConfig = configPath: {
303 ${if android == null then null else frontendName} = {
303 ${if android == null then null else frontendName} = {
304 executableName = "frontend";
304 executableName = "frontend";
305 ${if builtins.pathExists staticFiles then "assets" else null} =
305 ${if builtins.pathExists staticFiles then "assets" else null} =
@@ -308,7 +308,7 @@ in rec {
308 processedStatic.symlinked;
308 processedStatic.symlinked;
309 } // android;
309 } // android;
310 };
310 };
311− __ios = configPath: {
311+ __iosWithConfig = configPath: {
312 ${if ios == null then null else frontendName} = {
312 ${if ios == null then null else frontendName} = {
313 executableName = "frontend";
313 executableName = "frontend";
314 ${if builtins.pathExists staticFiles then "staticSrc" else null} =
314 ${if builtins.pathExists staticFiles then "staticSrc" else null} =
@@ -336,9 +336,9 @@ in rec {
336 commonName
336 commonName
337 ];
337 ];
338 };
338 };
339− android = __android (base + "/config");
339+ android = __androidWithConfig (base + "/config");
340− ios = __ios (base + "/config");
340+ ios = __iosWithConfig (base + "/config");
341− passthru = { inherit android ios packages overrides tools shellToolOverrides withHoogle staticFiles staticFilesImpure __closureCompilerOptimizationLevel processedStatic __ios __android; };
341+ passthru = { inherit android ios packages overrides tools shellToolOverrides withHoogle staticFiles staticFilesImpure __closureCompilerOptimizationLevel processedStatic __iosWithConfig __androidWithConfig; };
342 };
342 };
343 in mkProject (projectDefinition args));
343 in mkProject (projectDefinition args));
344 serverOn = sys: version: serverExe
344 serverOn = sys: version: serverExe
lib/command/src/Obelisk/Command/Deploy.hs+2−2
@@ -234,7 +234,7 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
234 [ "with (import ", srcDir, " {});"
234 [ "with (import ", srcDir, " {});"
235 , "android.frontend.override (drv: { "
235 , "android.frontend.override (drv: { "
236 , "releaseKey = (if builtins.isNull drv.releaseKey then {} else drv.releaseKey) // " <> releaseKey <> "; "
236 , "releaseKey = (if builtins.isNull drv.releaseKey then {} else drv.releaseKey) // " <> releaseKey <> "; "
237− , "staticSrc = (passthru.__android ", configDir, ").frontend.staticSrc;"
237+ , "staticSrc = (passthru.__androidWithConfig ", configDir, ").frontend.staticSrc;"
238 , "})"
238 , "})"
239 ]
239 ]
240 return $ Target
240 return $ Target
@@ -245,7 +245,7 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
245 IOS -> do
245 IOS -> do
246 let expr = mconcat
246 let expr = mconcat
247 [ "with (import ", srcDir, " {});"
247 [ "with (import ", srcDir, " {});"
248− , "ios.frontend.override (_: { staticSrc = (passthru.__ios ", configDir, ").frontend.staticSrc; })"
248+ , "ios.frontend.override (_: { staticSrc = (passthru.__iosWithConfig ", configDir, ").frontend.staticSrc; })"
249 ]
249 ]
250 return $ Target
250 return $ Target
251 { _target_path = Nothing
251 { _target_path = Nothing