dorion: add darwin support (#506962)

pkgs/by-name/do/dorion/no-cargo-patch.patch

@@ -1,31 +0,0 @@
-diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
-index 13a6b54..f6bd9d6 100644
---- a/src-tauri/Cargo.lock
-+++ b/src-tauri/Cargo.lock
-@@ -5049,6 +5049,8 @@ dependencies = [
- [[package]]
- name = "tauri-plugin-shell"
- version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
- dependencies = [
-  "encoding_rs",
-  "log",
-diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
-index 4dcaa86..daef086 100644
---- a/src-tauri/Cargo.toml
-+++ b/src-tauri/Cargo.toml
-@@ -12,13 +12,6 @@ rust-version = "1.84.1"
- strip = "debuginfo"
- lto = false
- 
--# Patches
--[package.metadata.patch]
--crates = ["tauri-plugin-shell"]
--
--[patch.crates-io]
--tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" }
--
- [build-dependencies]
- tauri-build = { version = "2.0.0", features = [] }
- 

pkgs/by-name/do/dorion/package.nix

@@ -1,10 +1,12 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchurl,
   rustPlatform,
   cmake,
   ninja,
+  makeBinaryWrapper,
   wrapGAppsHook4,
   glib-networking,
   gst_all_1,
@@ -20,8 +22,9 @@
   webkitgtk_4_1,
   cargo-tauri,
   desktop-file-utils,
-  fetchpatch,
   pipewire,
+  apple-sdk_15,
+  darwin,
 }:
 
 let
@@ -39,52 +42,36 @@ let
     };
   };
 in
-
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dorion";
-  version = "6.12.0";
+  version = "6.12.2";
 
   src = fetchFromGitHub {
     owner = "SpikeHD";
     repo = "Dorion";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pykmoSiV3iSaD/V/Sd5GSV/BZWhk9XVg8io1j8wZv5k=";
+    hash = "sha256-aPYQOec4D0I4N/6nmSwodXsh3pvcHnlD37fUIw5kMjo=";
   };
 
-  patches = [
-    # https://github.com/SpikeHD/Dorion/issues/419
-    (fetchpatch {
-      url = "https://github.com/SpikeHD/Dorion/commit/98d50dadd1a7fb018698a3fe61ac104cbe89b5d4.patch";
-      hash = "sha256-1VbB2CVMUWw18lWC4EL83VS4SdC03AxDUKRq/hQNAAg=";
-    })
-  ];
-
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-FJ4gQKgZkYqvjcqcRapJ8IQWP52kIg4uOTxifKG8zyo=";
+  cargoHash = "sha256-3FS8w9K3Wx7KbT7iy+0pAMdmreZnL+ZFMSAnwesnS7Y=";
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs)
-      pname
-      version
-      src
-      patches
-      ;
+    inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-qSmIyLv8A+JDbTVG+Qcvq3gqBXBGtfbH4/tN+CvEmd8=";
+    hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o=";
   };
 
-  # CMake (webkit extension)
+  # CMake (webkit extension, Linux only)
   cmakeDir = ".";
   cmakeBuildDir = "src-tauri/extension_webkit";
   dontUseCmakeConfigure = true;
   dontUseNinjaBuild = true;
   dontUseNinjaCheck = true;
   dontUseNinjaInstall = true;
-  # cmake's supposed to set this automatically
-  # ... but the detection is based on the presence of ninja build hook
   cmakeFlags = [
     "-GNinja"
   ];
@@ -95,15 +82,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cargo-tauri.hook
     nodejs
     pkg-config
-    wrapGAppsHook4
     yq-go
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
     desktop-file-utils
     cmake
     ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+    darwin.autoSignDarwinBinariesHook
   ];
 
   buildInputs = [
     openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     webkitgtk_4_1'
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
@@ -114,51 +109,65 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libsysprof-capture
     libayatana-appindicator
     pipewire
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
   ];
 
   postPatch = ''
     # remove updater
     rm -rf updater
 
-    substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-
     # disable pre-build script and disable auto-updater
     yq -iPo=json '
       .bundle.resources = (.bundle.resources | map(select(. != "updater*")))
     ' src-tauri/tauri.conf.json
 
     # link shelter injection
-    ln -s ${shelter} src-tauri/injection/shelter.js
+    ln -s "${shelter}" src-tauri/injection/shelter.js
 
     # link html/frontend data
-    ln -s $(pwd)/src src-tauri/html
+    ln -s "$(pwd)/src" src-tauri/html
+  ''
+  # disable Tauri's built-in codesigning
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    yq -iPo=json '
+      .bundle.macOS.signingIdentity = null
+    ' src-tauri/tauri.conf.json
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace "$cargoDepsCopy"/*/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
   '';
 
   configurePhase = ''
     runHook preConfigure
-
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     cmakeConfigurePhase
+  ''
+  + ''
     pnpmConfigHook
-
     runHook postConfigure
   '';
 
-  buildPhase = ''
-    ninjaBuildPhase
-    cd ../..
-    tauriBuildHook
-  '';
+  buildPhase =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      ninjaBuildPhase
+      cd ../..
+    ''
+    + ''
+      tauriBuildHook
+    '';
 
   postInstall = ''
-    # Set up the resource directories
-    mkdir -p $out/lib/Dorion
-    ln -s $out/lib/Dorion $out/lib/dorion
-    rm -rf $out/lib/Dorion/injection
-    cp -r src-tauri/injection $out/lib/Dorion
-    cp -r src $out/lib/Dorion
-
-    # Modify the desktop file
+    mkdir -p "$out/lib/Dorion"
+    ln -s "$out/lib/Dorion" "$out/lib/dorion"
+    rm -rf "$out/lib/Dorion/injection"
+    cp -r src-tauri/injection "$out/lib/Dorion"
+    cp -r src "$out/lib/Dorion"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     desktop-file-edit \
       --set-comment "Tiny alternative Discord client" \
       --set-key="Exec" --set-value="Dorion %U" \
@@ -169,7 +178,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \
       --set-key="Terminal" --set-value="false" \
       --set-key="MimeType" --set-value="x-scheme-handler/discord" \
-      $out/share/applications/Dorion.desktop
+      "$out/share/applications/Dorion.desktop"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeBinaryWrapper "$out/Applications/Dorion.app/Contents/MacOS/Dorion" "$out/bin/Dorion"
   '';
 
   # error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)`
@@ -200,7 +212,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       griffi-gh
       getchoo
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     sourceProvenance = [
       lib.sourceTypes.binaryBytecode # actually, minified JS
       lib.sourceTypes.fromSource