From 2dffbb0a98458915af30aa03d8d0f56033dd4e7f Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Sat, 1 Feb 2025 10:58:25 -0800
Subject: [PATCH] [packages] Use nixpkgs for nextcloud-talk-desktop

---
 home/home-default.nix                       |  3 +-
 packages/default.nix                        |  1 -
 packages/nextcloud-talk-desktop/default.nix | 86 ---------------------
 3 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 packages/nextcloud-talk-desktop/default.nix

diff --git a/home/home-default.nix b/home/home-default.nix
index f1927b9..6be626e 100644
--- a/home/home-default.nix
+++ b/home/home-default.nix
@@ -52,6 +52,7 @@ in
     pkgs.less
     pkgs.moonlight-qt
     pkgs.ncdu
+    pkgs.nextcloud-talk-desktop
     pkgs.pandoc
     pkgs.pinentry-qt
     #pkgs.pytest
@@ -61,8 +62,6 @@ in
     pkgs.waybar
     pkgs.wofi
     pkgs.vlc
-
-    customPkgs.nextcloudTalkDesktop
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/packages/default.nix b/packages/default.nix
index 442da37..407b1fb 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,5 +1,4 @@
 { pkgs, ... }:
 {
-  nextcloudTalkDesktop = pkgs.callPackage ./nextcloud-talk-desktop {};
   vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
 }
diff --git a/packages/nextcloud-talk-desktop/default.nix b/packages/nextcloud-talk-desktop/default.nix
deleted file mode 100644
index 91956af..0000000
--- a/packages/nextcloud-talk-desktop/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  autoPatchelfHook,
-  nss,
-  cairo,
-  xorg,
-  libxkbcommon,
-  alsa-lib,
-  at-spi2-core,
-  mesa,
-  pango,
-  libdrm,
-  vivaldi-ffmpeg-codecs,
-  gtk3,
-  libGL,
-  libglvnd,
-  systemd,
-}:
-
-stdenv.mkDerivation (finalAttrs: rec {
-  pname = "nextcloud-talk-desktop";
-  version = "0.39.0";
-
-  # Building from source would require building also building Server and Talk components
-  # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
-  src = fetchzip {
-    url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-f8X6I2Je9wgstMTuYGaX7AXAqpZC92RUAltDVsHr9Vo=";
-    stripRoot = false;
-  };
-
-  nativeBuildInputs = [ autoPatchelfHook ];
-
-  buildInputs =
-    [
-      nss
-      cairo
-      alsa-lib
-      at-spi2-core
-      pango
-      libdrm
-      libxkbcommon
-      gtk3
-      vivaldi-ffmpeg-codecs
-      mesa
-      libGL
-      libglvnd
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcomposite
-      libXdamage
-      libXrandr
-      libXfixes
-      libXcursor
-    ]);
-
-  # Required to launch the application and proceed past the zygote_linux fork() process
-  # Fixes `Zygote could not fork`
-  runtimeDependencies = [ systemd ];
-
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p $out/opt
-    cp -r $src/* $out/opt/
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    # Link the application in $out/bin away from contents of `preInstall`
-    ln -s "$out/opt/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Nextcloud Talk Desktop Client";
-    homepage = "https://github.com/nextcloud/talk-desktop";
-    changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ kashw2 ];
-    mainProgram = "nextcloud-talk-desktop";
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-  };
-})