From 3a83af709f7fd4493df000974895f0ea07829c0d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 31 Mar 2026 16:50:43 -0500
Subject: [PATCH 1/2] teamviewer: migrate to by-name

---
 .../default.nix => by-name/te/teamviewer/package.nix}         | 4 ++--
 .../remote => by-name/te}/teamviewer/update-teamviewer.sh     | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/networking/remote/teamviewer/default.nix => by-name/te/teamviewer/package.nix} (99%)
 rename pkgs/{applications/networking/remote => by-name/te}/teamviewer/update-teamviewer.sh (100%)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/by-name/te/teamviewer/package.nix
similarity index 99%
rename from pkgs/applications/networking/remote/teamviewer/default.nix
rename to pkgs/by-name/te/teamviewer/package.nix
index b6218e40fa42..bae0059e6268 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/by-name/te/teamviewer/package.nix
@@ -16,7 +16,7 @@
   libsm,
   libxfixes,
   coreutils,
-  wrapQtAppsHook,
+  libsForQt5,
   icu63,
   nss,
   minizip,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoPatchelfHook
     makeWrapper
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     minizip
diff --git a/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh b/pkgs/by-name/te/teamviewer/update-teamviewer.sh
similarity index 100%
rename from pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh
rename to pkgs/by-name/te/teamviewer/update-teamviewer.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb5759dcc792..527299b29868 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3512,8 +3512,6 @@ with pkgs;
     youtube-dl = yt-dlp;
   };
 
-  teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
-
   buildTeleport = callPackage ../build-support/teleport { };
 
   telepresence = callPackage ../tools/networking/telepresence {

From b7ee3ad5baa5e8f227cf835f39e1faacefcedf0d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 31 Mar 2026 16:56:40 -0500
Subject: [PATCH 2/2] teamviewer: use finalAttrs

---
 pkgs/by-name/te/teamviewer/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/te/teamviewer/package.nix b/pkgs/by-name/te/teamviewer/package.nix
index bae0059e6268..51953fad79ee 100644
--- a/pkgs/by-name/te/teamviewer/package.nix
+++ b/pkgs/by-name/te/teamviewer/package.nix
@@ -22,7 +22,7 @@
   minizip,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "teamviewer";
   # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
   outputs = [
@@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
 
   src =
     let
-      base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x";
+      base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major finalAttrs.version}x";
     in
     {
       x86_64-linux = fetchurl {
-        url = "${base_url}/teamviewer_${version}_amd64.deb";
+        url = "${base_url}/teamviewer_${finalAttrs.version}_amd64.deb";
         hash = "sha256-7QQlGzIr3BBFaur8ycGY0VuYz21cJI+EfCsRuCAr8XA=";
       };
       aarch64-linux = fetchurl {
-        url = "${base_url}/teamviewer_${version}_arm64.deb";
+        url = "${base_url}/teamviewer_${finalAttrs.version}_arm64.deb";
         hash = "sha256-prz3RaeMykgLrK9ai3/ivzRsUFT1dyWP1xymEl3s4eA=";
       };
     }
@@ -164,4 +164,4 @@ stdenv.mkDerivation rec {
       c4patino
     ];
   };
-}
+})