From 8b4d595e9f82c2716d981e49fd23f6a1ae491108 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 4 Jul 2025 19:09:11 +1000 Subject: [PATCH 1/2] quiet: add darwin support --- pkgs/by-name/qu/quiet/package.nix | 64 +++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix index a32c369ceab2..be233e2ce92e 100644 --- a/pkgs/by-name/qu/quiet/package.nix +++ b/pkgs/by-name/qu/quiet/package.nix @@ -3,23 +3,71 @@ stdenv, fetchurl, appimageTools, + makeWrapper, + _7zz, }: -appimageTools.wrapType2 rec { +let pname = "quiet"; version = "5.1.2"; - src = fetchurl { - url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage"; - hash = "sha256-ahJUBvQVfU8CtGq5p+S8avpHRkXSn9kQv9HPN7TvJiM="; - }; - meta = { description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS"; homepage = "https://github.com/TryQuiet/quiet"; changelog = "https://github.com/TryQuiet/quiet/releases/tag/@quiet/desktop@${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ kashw2 ]; - platforms = [ "x86_64-linux" ]; }; -} + + linux = appimageTools.wrapType2 { + inherit pname version; + + src = fetchurl { + url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage"; + hash = "sha256-YIkbS3L6DIof9gsgHKaguHIwGggVLjQXPM8o7810Wgs="; + }; + + meta = meta // { + platforms = lib.platforms.linux; + }; + }; + + darwin = stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.dmg"; + hash = "sha256-B1rT+6U0gjScr1FPuh3xGxkpfumT/8feTJbEbCgXPpo="; + }; + + nativeBuildInputs = [ + _7zz + makeWrapper + ]; + + sourceRoot = "Quiet ${version}"; + + unpackPhase = '' + runHook preUnpack + + 7zz x $src -x!Quiet\ ${version}/Applications + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstallPhase + + mkdir -p $out/{Applications,bin} + mv Quiet.app $out/Applications + makeWrapper $out/Applications/Quiet.app/Contents/MacOS/Quiet $out/bin/${pname} + + runHook postInstallPhase + ''; + + meta = meta // { + platforms = lib.platforms.darwin; + }; + }; +in +if stdenv.hostPlatform.isDarwin then darwin else linux From 341232cc4c28d75f5bfb8b971613ff89c40eecab Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 4 Jul 2025 19:22:02 +1000 Subject: [PATCH 2/2] quiet: 5.1.2 -> 6.0.0 --- pkgs/by-name/qu/quiet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix index be233e2ce92e..a253ff36d3e8 100644 --- a/pkgs/by-name/qu/quiet/package.nix +++ b/pkgs/by-name/qu/quiet/package.nix @@ -9,7 +9,7 @@ let pname = "quiet"; - version = "5.1.2"; + version = "6.0.0"; meta = { description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS";