From e6c5f4cff886a131b74be494405e0d6a4c740518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Apr 2023 16:46:39 +0200 Subject: [PATCH] telegram-desktop: rename from tdesktop --- .../telegram/{tdesktop => telegram-desktop}/default.nix | 1 - .../telegram/{tdesktop => telegram-desktop}/tg_owt.nix | 0 .../telegram/{tdesktop => telegram-desktop}/update.py | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/networking/instant-messengers/telegram/{tdesktop => telegram-desktop}/default.nix (99%) rename pkgs/applications/networking/instant-messengers/telegram/{tdesktop => telegram-desktop}/tg_owt.nix (100%) rename pkgs/applications/networking/instant-messengers/telegram/{tdesktop => telegram-desktop}/update.py (100%) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix similarity index 99% rename from pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix rename to pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6b47401c5580..763ed658af88 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py - # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix rename to pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py rename to pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5004a976bd39..c124bc27d21b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1560,6 +1560,7 @@ mapAliases ({ tangogps = foxtrotgps; # Added 2020-01-26 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + tdesktop = telegram-desktop; # Added 2023-04-07 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01b088004bbf..21fc62a4a82b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31386,7 +31386,7 @@ with pkgs; then darwin.apple_sdk_11_0.stdenv else stdenv; - # tdesktop has random crashes when jemalloc is built with gcc. + # telegram-desktop has random crashes when jemalloc is built with gcc. # Apparently, it triggers some bug due to usage of gcc's builtin # functions like __builtin_ffsl by jemalloc when it's built with gcc. jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: { @@ -33925,7 +33925,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { abseil-cpp = abseil-cpp_202206; };