From 1aa2b72a7bdbda58b9924026375f915a32ccedd1 Mon Sep 17 00:00:00 2001
From: Alice Carroll <git@alice-carroll.pet>
Date: Sat, 15 Jun 2024 22:37:59 +0300
Subject: [PATCH 1/2] revolt-desktop: darwin support

---
 .../revolt-desktop/default.nix                | 111 +++++++++++-------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix b/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
index d995f81406cb..6a7461f3b13e 100644
--- a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
@@ -1,62 +1,85 @@
-{ stdenv
+{ stdenvNoCC
 , lib
 , fetchurl
+, fetchzip
 , appimageTools
 , makeWrapper
 , electron
 }:
-
-stdenv.mkDerivation rec {
+(stdenvNoCC.mkDerivation {
   pname = "revolt-desktop";
   version = "1.0.6";
-
-  src = fetchurl {
-    url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
-    sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    name = "${pname}-${version}";
-    inherit src;
-  };
-
-  dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
-
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share/{applications,revolt-desktop}
-
-    cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
-    cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
-    cp -a ${appimageContents}/usr/share/icons $out/share/icons
-
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
-      --add-flags $out/share/${pname}/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
-  '';
-
   meta = with lib; {
     description = "Open source user-first chat platform";
     homepage = "https://revolt.chat/";
     changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ heyimnova ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      heyimnova
+      caralice
+    ];
+    platforms = platforms.linux ++ platforms.darwin;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     mainProgram = "revolt-desktop";
   };
-}
+  nativeBuildInputs = [ makeWrapper ];
+}).overrideAttrs
+  (
+    final: prev:
+    let
+      inherit (prev) pname version;
+    in
+    if stdenvNoCC.isLinux then
+      {
+        src = fetchurl {
+          url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
+          sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
+        };
+
+        appimageContents = appimageTools.extractType2 { inherit (final) src pname version; };
+
+        dontUnpack = true;
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out/bin $out/share/{applications,revolt-desktop}
+
+          cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname}
+          cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
+          cp -a ${final.appimageContents}/usr/share/icons $out/share/icons
+
+          substituteInPlace $out/share/applications/${pname}.desktop \
+            --replace 'Exec=AppRun' 'Exec=${pname}'
+
+          runHook postInstall
+        '';
+
+        postFixup = ''
+          makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+            --add-flags $out/share/${pname}/resources/app.asar \
+            --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+        '';
+      }
+    else
+      assert stdenvNoCC.isDarwin;
+      {
+        src = fetchzip {
+          url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip";
+          hash = "sha256-XxmKcIfJtHfi6SahrRHMeTAuyVqiN9Yhayjis10vD2w=";
+          stripRoot = false;
+        };
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p "$out/Applications/" "$out/bin/"
+          mv Revolt.app "$out/Applications/"
+          makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}"
+
+          runHook postInstall
+        '';
+      }
+  )

From da2e0f92dc9a0d25394540d184630bce21fcf6a8 Mon Sep 17 00:00:00 2001
From: Alice Carroll <git@alice-carroll.pet>
Date: Sun, 23 Jun 2024 14:27:29 +0300
Subject: [PATCH 2/2] revolt-desktop: migrate to pkgs/by-name

---
 .../default.nix => by-name/re/revolt-desktop/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/revolt-desktop/default.nix => by-name/re/revolt-desktop/package.nix} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix b/pkgs/by-name/re/revolt-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
rename to pkgs/by-name/re/revolt-desktop/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 894cc0d9c239..825c286657fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12095,8 +12095,6 @@ with pkgs;
 
   raysession = python3Packages.callPackage ../applications/audio/raysession {};
 
-  revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { };
-
   rbw = callPackage ../tools/security/rbw { };
 
   remarshal = with python3Packages; toPythonApplication remarshal;