@@ -1,4 +1,7 @@
1−{ self-args ? {}
1+{ self-args ? {
2+ config.android_sdk.accept_license = true;
3+ iosSdkVersion = "10.2";
4+ }
25, local-self ? import ./. self-args
36}:
47
@@ -45,7 +48,7 @@ let
4548 in pkgAttrs: builtins.concatLists (map extractDeps (builtins.attrValues pkgAttrs));
4649
4750 perPlatform = lib.genAttrs cacheBuildSystems (system: let
48− obelisk = import ./. { inherit system; };
51+ obelisk = import ./. (self-args // { inherit system; });
4952 reflex-platform = obelisk.reflex-platform;
5053 ghc = pnameToAttrs
5154 obelisk.haskellPackageSets.ghc
@@ -62,8 +65,8 @@ let
6265 (lib.optional reflex-platform.iosSupport iosSkeleton)
6366 [ command serverSkeletonExe serverSkeletonShell ]
6467 ];
65− command = local-self.command;
66− skeleton = import ./skeleton { obelisk = local-self; };
68+ command = obelisk.command;
69+ skeleton = import ./skeleton { inherit obelisk; };
6770 serverSkeletonExe = skeleton.exe;
6871 # TODO fix nixpkgs so it doesn't try to run the result of haskell shells as setup hooks.
6972 serverSkeletonShell = local-self.nixpkgs.runCommand "shell-safe-for-dep" {} ''
@@ -71,15 +74,8 @@ let
7174 echo "return" >> "$out"
7275 cat "${skeleton.shells.ghc}" >> "$out"
7376 '';
74− androidObelisk = import ./. (self-args // {
75− config.android_sdk.accept_license = true;
76− });
77− androidSkeleton = (import ./skeleton { obelisk = androidObelisk; }).android.frontend;
78− iosObelisk = import ./. (self-args // {
79− system = "x86_64-darwin";
80− iosSdkVersion = "10.2";
81− });
82− iosSkeleton = (import ./skeleton { obelisk = iosObelisk; }).ios.frontend;
77+ androidSkeleton = (import ./skeleton { inherit obelisk; }).android.frontend;
78+ iosSkeleton = (import ./skeleton { inherit obelisk; }).ios.frontend;
8379 in {
8480 inherit
8581 command
@@ -94,7 +90,7 @@ let
9490 inherit iosSkeleton;
9591 });
9692
97− metaCache = local-self.pinBuildInputs
93+ metaCache = local-self.reflex-platform.pinBuildInputs
9894 "obelisk-everywhere"
9995 (map (a: a.cache) (builtins.attrValues perPlatform));
10096