From bca6b6ac984ed6ff86dd2be0480778c0f70ff6ad Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 9 Jul 2023 22:17:59 +0200
Subject: [PATCH 1/3] teamspeak_client: 3.5.6 -> 3.6.0

Upstream dropped x86 support
---
 .../instant-messengers/teamspeak/client.nix   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 5a0a9006e0df..6e14183ab9ec 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
 , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config
-, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin
+, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages_10
 }:
 
 let
 
-  arch = if stdenv.is64bit then "amd64" else "x86";
+  arch = "amd64";
 
-  libDir = if stdenv.is64bit then "lib64" else "lib";
+  libDir = "lib64";
 
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl
@@ -25,21 +25,16 @@ let
     genericName = "TeamSpeak";
     categories = [ "Network" ];
   };
-
-  fakeLess = writeShellScriptBin "less" "cat";
-
 in
 
 stdenv.mkDerivation rec {
   pname = "teamspeak-client";
 
-  version = "3.5.6";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
-    sha256 = if stdenv.is64bit
-                then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg"
-                else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija";
+    hash = "sha256-ZbElnFoQmXdtCR9lb6eOz4dMzSwpfjC1DvG3VbDoSEA=";
   };
 
   # grab the plugin sdk for the desktop icon
@@ -48,11 +43,20 @@ stdenv.mkDerivation rec {
     sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
   };
 
-  nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
+  nativeBuildInputs = [
+    makeWrapper
+    which
+    unzip
+    perl # Installer script needs `shasum`
+  ];
 
+  # This just runs the installer script. If it gets stuck at something like
+  # ++ exec
+  # + PAGER_PATH=
+  # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs.
   unpackPhase =
     ''
-      echo -e '\ny' | sh -xe $src
+      echo -e '\ny' | PAGER=cat sh -xe $src
       cd TeamSpeak*
     '';
 
@@ -111,7 +115,7 @@ stdenv.mkDerivation rec {
       free = false;
     };
     maintainers = with maintainers; [ lhvwb lukegb ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "x86_64-linux" ];
   };
 }
 

From 4535fcd653bf5f88b95067f567ed46c3e96403f2 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 9 Jul 2023 22:20:54 +0200
Subject: [PATCH 2/3] teamspeak_client: add myself to maintainers

---
 .../networking/instant-messengers/teamspeak/client.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 6e14183ab9ec..c6284145607b 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
       url = "https://www.teamspeak.com/en/privacy-and-terms/";
       free = false;
     };
-    maintainers = with maintainers; [ lhvwb lukegb ];
+    maintainers = with maintainers; [ lhvwb lukegb atemu ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 6543a56a0e77d2da8f610cd5cfe3bc6c4adf307b Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 9 Jul 2023 22:26:03 +0200
Subject: [PATCH 3/3] Revert "teamspeak_client: use llvmPackages_10"

Works with the default llvm again now.

This reverts commit 7ded73412a61ad0ffc57332daa73505acaa3f953.
---
 .../networking/instant-messengers/teamspeak/client.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index c6284145607b..8735870e106d 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
 , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config
-, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages_10
+, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages
 }:
 
 let
@@ -13,7 +13,7 @@ let
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
       xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg
-      qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395
+      qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi
     ];
 
   desktopItem = makeDesktopItem {