Merge pull request #232 from HarborWallet/macos-dylibs

gettext and other macos dylibs

Author: benthecarman

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: CI 
+name: CI
 
 on:
   pull_request:
@@ -9,6 +9,8 @@ jobs:
     permissions:
       id-token: "write"
       contents: "read"
+    env:
+      USE_VENDOR_FEATURE: "1"
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
@@ -24,5 +26,5 @@ jobs:
         run: nix develop --command bash -c "just format-check"
       - name: Run clippy
         run: nix develop --command bash -c "just clippy"
-      - name: Run tests 
+      - name: Run tests
         run: nix develop --command bash -c "just test"

Cargo.lock

@@ -76,6 +76,7 @@
 
         devShell = pkgs.mkShell rec {
           packages = inputs ++ [
+            pkgs.git
             pkgs.mesa
             pkgs.libglvnd # Adds EGL support
             pkgs.xorg.libX11

flake.nix

@@ -35,9 +35,8 @@ rm -f "$APP_TEMPLATE_PLIST.tmp.bak"
 export MACOSX_DEPLOYMENT_TARGET="11.0"
 
 echo "Building Harbor for Apple Silicon..."
-cd harbor-ui
-cargo build --release --target=aarch64-apple-darwin --features vendored
-cd ..
+# Build from the root directory and explicitly specify the package
+cargo build --release --target=aarch64-apple-darwin --features vendored -p harbor-ui
 
 echo "Creating app bundle..."
 # build app
@@ -46,4 +45,77 @@ mkdir -p "$APP_EXTRAS_DIR"
 cp -fRp "$APP_TEMPLATE" "$APP_DIR"
 cp -fp "target/aarch64-apple-darwin/release/$TARGET" "$APP_BINARY_DIR/harbor"
 touch -r "target/aarch64-apple-darwin/release/$TARGET" "$APP_DIR/$APP_NAME"
+
+# Bundle libintl.8.dylib with the app
+echo "Bundling and fixing libintl.8.dylib..."
+FRAMEWORKS_DIR="$APP_DIR/$APP_NAME/Contents/Frameworks"
+# Ensure directory exists with proper permissions
+mkdir -p "$FRAMEWORKS_DIR"
+chmod 755 "$FRAMEWORKS_DIR"
+
+# Find libintl.8.dylib in nix store
+LIBINTL_PATH=$(find /nix/store -name "libintl.8.dylib" -type f | head -n 1)
+if [ -n "$LIBINTL_PATH" ]; then
+    echo "Found libintl at: $LIBINTL_PATH"
+    
+    # Copy to Frameworks directory with sudo if needed
+    echo "Copying library to Frameworks..."
+    if ! cp "$LIBINTL_PATH" "$FRAMEWORKS_DIR/"; then
+        echo "Standard copy failed, trying with elevated permissions..."
+        # Try with sudo if available
+        if command -v sudo >/dev/null 2>&1; then
+            sudo cp "$LIBINTL_PATH" "$FRAMEWORKS_DIR/"
+            sudo chown $(whoami) "$FRAMEWORKS_DIR/libintl.8.dylib"
+            sudo chmod 644 "$FRAMEWORKS_DIR/libintl.8.dylib"
+        else
+            echo "ERROR: Could not copy libintl.8.dylib to Frameworks directory"
+            exit 1
+        fi
+    fi
+    
+    # Update binary to reference the bundled library using @rpath
+    echo "Fixing reference in binary..."
+    install_name_tool -add_rpath "@executable_path/../Frameworks" "$APP_BINARY_DIR/harbor"
+    install_name_tool -change "$LIBINTL_PATH" "@rpath/libintl.8.dylib" "$APP_BINARY_DIR/harbor"
+    
+    # Check if there are any other dependencies of libintl.8.dylib
+    SUB_DEPS=$(otool -L "$FRAMEWORKS_DIR/libintl.8.dylib" | grep -v "/System/" | grep -v "@rpath" | grep -v "@executable_path" | grep -v "/usr/lib/" | awk -F' ' '{print $1}')
+    if [ -n "$SUB_DEPS" ]; then
+        echo "Processing dependencies of libintl.8.dylib..."
+        for SUB_DEP_PATH in $SUB_DEPS; do
+            # Skip if it's referring to itself
+            if [[ "$SUB_DEP_PATH" == *"libintl.8.dylib"* ]]; then
+                continue
+            fi
+            
+            SUB_DEP_NAME=$(basename "$SUB_DEP_PATH")
+            echo "Processing dependency: $SUB_DEP_NAME"
+            
+            # Copy to Frameworks directory with sudo if needed
+            if ! cp "$SUB_DEP_PATH" "$FRAMEWORKS_DIR/"; then
+                echo "Standard copy failed for $SUB_DEP_NAME, trying with elevated permissions..."
+                if command -v sudo >/dev/null 2>&1; then
+                    sudo cp "$SUB_DEP_PATH" "$FRAMEWORKS_DIR/"
+                    sudo chown $(whoami) "$FRAMEWORKS_DIR/$SUB_DEP_NAME"
+                    sudo chmod 644 "$FRAMEWORKS_DIR/$SUB_DEP_NAME"
+                else
+                    echo "WARNING: Could not copy $SUB_DEP_NAME to Frameworks directory"
+                    continue
+                fi
+            fi
+            
+            # Fix the reference in libintl
+            install_name_tool -change "$SUB_DEP_PATH" "@rpath/$SUB_DEP_NAME" "$FRAMEWORKS_DIR/libintl.8.dylib"
+            
+            # Set the ID
+            install_name_tool -id "@rpath/$SUB_DEP_NAME" "$FRAMEWORKS_DIR/$SUB_DEP_NAME"
+        done
+    fi
+    
+    # Fix the ID of libintl itself
+    install_name_tool -id "@rpath/libintl.8.dylib" "$FRAMEWORKS_DIR/libintl.8.dylib"
+else
+    echo "Warning: Could not find libintl.8.dylib in nix store!"
+fi
+
 echo "✨ Created '$APP_NAME' in '$APP_DIR'"

scripts/build-macos.sh

@@ -17,6 +17,7 @@ RELEASE_DIR="target/release"
 APP_DIR="$RELEASE_DIR/macos"
 APP_NAME="Harbor.app"
 APP_PATH="$APP_DIR/$APP_NAME"
+FRAMEWORKS_DIR="$APP_PATH/Contents/Frameworks"
 
 # Clean up any leftover files from previous runs
 rm -f certificate.p12 notarization.zip
@@ -82,8 +83,18 @@ echo "Checking for valid signing identities..."
 IDENTITIES=$(security find-identity -v -p codesigning build.keychain | grep -c "valid identities found")
 echo "Found $IDENTITIES valid signing identities"
 
+# First sign any bundled libraries in the Frameworks directory
+if [ -d "$FRAMEWORKS_DIR" ]; then
+    echo "Signing bundled libraries in Frameworks directory..."
+    find "$FRAMEWORKS_DIR" -type f -name "*.dylib" | while read -r lib; do
+        echo "Signing library: $(basename "$lib")"
+        /usr/bin/codesign --force --timestamp --sign "$MACOS_CERTIFICATE_NAME" --options runtime "$lib"
+    done
+fi
+
 echo "Signing Harbor.app..."
-/usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH" -v
+# Sign the app with deep option to handle all bundled components
+/usr/bin/codesign --force --deep --timestamp -s "$MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH" -v
 
 echo "Creating keychain profile for notarization..."
 xcrun notarytool store-credentials "harbor-notary-profile" \