move logic

status-im · Aug 30, 2023 · 71acd85 · 71acd85
1 parent 184d130
commit 71acd85
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/nix/mobile/ios/shells/status-go.nix b/nix/mobile/ios/shells/status-go.nix
@@ -3,28 +3,33 @@
 # It copies the status-go build result to 'modules/react-native-status/ios/RCTStatus'.
 #
 
-{ mkShell, status-go }:
+{ lib, mkShell, status-go }:
 
-mkShell {
-  shellHook = ''
-    export STATUS_GO_IOS_LIBDIR=${status-go}/Statusgo.xcframework
-
-    RCTSTATUS_DIR="$STATUS_MOBILE_HOME/modules/react-native-status/ios/RCTStatus"
-    targetBasename='Statusgo.xcframework'
-
-    # Compare target folder with source to see if copying is required
-    if [ -d "$RCTSTATUS_DIR/$targetBasename" ] && [ -d $STATUS_MOBILE_HOME/ios/Pods/ ] && \
-      diff -qr --no-dereference $RCTSTATUS_DIR/$targetBasename/ $STATUS_GO_IOS_LIBDIR/ > /dev/null; then
-      echo "$RCTSTATUS_DIR/$targetBasename already in place"
-    else
-      sourceBasename="$(basename $STATUS_GO_IOS_LIBDIR)"
-      echo "Copying $sourceBasename from Nix store to $RCTSTATUS_DIR"
-      rm -rf "$RCTSTATUS_DIR/$targetBasename/"
-      cp -a $STATUS_GO_IOS_LIBDIR $RCTSTATUS_DIR
-      chmod -R 755 "$RCTSTATUS_DIR/$targetBasename"
-      if [ "$sourceBasename" != "$targetBasename" ]; then
-        mv "$RCTSTATUS_DIR/$sourceBasename" "$RCTSTATUS_DIR/$targetBasename"
+let
+    targets = let
+      targetsString = lib.getEnvWithDefault "IOS_STATUS_GO_TARGETS" "ios;iossimulator";
+    in lib.splitString ";" targetsString;
+in
+  mkShell {
+    shellHook = ''
+      export STATUS_GO_IOS_LIBDIR=${status-go { inherit targets; } }/Statusgo.xcframework
+ 
+      RCTSTATUS_DIR="$STATUS_MOBILE_HOME/modules/react-native-status/ios/RCTStatus"
+      targetBasename='Statusgo.xcframework'
+ 
+      # Compare target folder with source to see if copying is required
+      if [ -d "$RCTSTATUS_DIR/$targetBasename" ] && [ -d $STATUS_MOBILE_HOME/ios/Pods/ ] && \
+        diff -qr --no-dereference $RCTSTATUS_DIR/$targetBasename/ $STATUS_GO_IOS_LIBDIR/ > /dev/null; then
+        echo "$RCTSTATUS_DIR/$targetBasename already in place"
+      else
+        sourceBasename="$(basename $STATUS_GO_IOS_LIBDIR)"
+        echo "Copying $sourceBasename from Nix store to $RCTSTATUS_DIR"
+        rm -rf "$RCTSTATUS_DIR/$targetBasename/"
+        cp -a $STATUS_GO_IOS_LIBDIR $RCTSTATUS_DIR
+        chmod -R 755 "$RCTSTATUS_DIR/$targetBasename"
+        if [ "$sourceBasename" != "$targetBasename" ]; then
+          mv "$RCTSTATUS_DIR/$sourceBasename" "$RCTSTATUS_DIR/$targetBasename"
+        fi
       fi
-    fi
-  '';
+    '';
 }
diff --git a/nix/status-go/mobile/default.nix b/nix/status-go/mobile/default.nix
@@ -17,13 +17,10 @@
     inherit meta source goBuildLdFlags;
   };
 
-  ios = callPackage ./build.nix {
+  ios = {targets ? [ "ios" "iossimulator"]}: callPackage ./build.nix {
     platform = "ios";
     platformVersion = "8.0";
-    targets = let
-      targetsString = lib.getEnvWithDefault "IOS_STATUS_GO_TARGETS" "ios;iossimulator";
-    in lib.splitString ";" targetsString;
     outputFileName = "Statusgo.xcframework";
-    inherit meta source goBuildLdFlags;
+    inherit meta source goBuildLdFlags targets;
   };
 }