From f0f0abfa5d2f4280b0ebd68d1346088f1390070f Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Fri, 30 May 2025 13:43:57 +1000 Subject: [PATCH] cargo-tauri: patched setfile --- pkgs/by-name/ca/cargo-tauri/package.nix | 4 +++ .../ca/cargo-tauri/skip-icon-macos.patch | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-tauri/skip-icon-macos.patch diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 8fb169acf817..6f07914f90f0 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -39,6 +39,10 @@ rustPlatform.buildRustPackage (finalAttrs: { zstd ]; + patches = [ + ./skip-icon-macos.patch + ]; + cargoBuildFlags = [ "--package" "tauri-cli" diff --git a/pkgs/by-name/ca/cargo-tauri/skip-icon-macos.patch b/pkgs/by-name/ca/cargo-tauri/skip-icon-macos.patch new file mode 100644 index 000000000000..091c4daa2952 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/skip-icon-macos.patch @@ -0,0 +1,29 @@ +diff --git a/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg b/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg +index fee840034..cfa584d52 100644 +--- a/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg ++++ b/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg +@@ -461,12 +461,6 @@ if [[ -n "$QL_LINK" ]]; then + ln -s "/Library/QuickLook" "$MOUNT_DIR/QuickLook" + fi + +-if [[ -n "$VOLUME_ICON_FILE" ]]; then +- echo "Copying volume icon file '$VOLUME_ICON_FILE'..." +- cp "$VOLUME_ICON_FILE" "$MOUNT_DIR/.VolumeIcon.icns" +- SetFile -c icnC "$MOUNT_DIR/.VolumeIcon.icns" +-fi +- + if [[ -n "$ADD_FILE_SOURCES" ]]; then + echo "Copying custom files..." + for i in "${!ADD_FILE_SOURCES[@]}"; do +@@ -538,11 +532,6 @@ else + echo "Skipping blessing on sandbox" + fi + +-if [[ -n "$VOLUME_ICON_FILE" ]]; then +- # Tell the volume that it has a special file attribute +- SetFile -a C "$MOUNT_DIR" +-fi +- + # Delete unnecessary file system events log if possible + echo "Deleting .fseventsd" + rm -rf "${MOUNT_DIR}/.fseventsd" || true