diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/by-name/te/teamviewer/package.nix similarity index 94% rename from pkgs/applications/networking/remote/teamviewer/default.nix rename to pkgs/by-name/te/teamviewer/package.nix index b6218e40fa42..51953fad79ee 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/by-name/te/teamviewer/package.nix @@ -16,13 +16,13 @@ libsm, libxfixes, coreutils, - wrapQtAppsHook, + libsForQt5, icu63, nss, 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="; }; } @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ minizip @@ -164,4 +164,4 @@ stdenv.mkDerivation rec { c4patino ]; }; -} +}) 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 99872e32aee4..bdb04b486a72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3491,8 +3491,6 @@ with pkgs; youtube-dl = yt-dlp; }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; - buildTeleport = callPackage ../build-support/teleport { }; telepresence = callPackage ../tools/networking/telepresence {