summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-07 16:46:39 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-07 16:46:39 +0200
commite6c5f4cff886a131b74be494405e0d6a4c740518 (patch)
treee93eed2dde4cb0c6fa5a0354c2ea68e41ee02938
parentc816bd50aa41bd3ab4adfeb62ac918566076d59f (diff)
downloadnixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar.gz
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar.bz2
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar.lz
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar.xz
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.tar.zst
nixpkgs-e6c5f4cff886a131b74be494405e0d6a4c740518.zip
telegram-desktop: rename from tdesktop
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix)1
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix)0
-rwxr-xr-xpkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py)0
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix4
5 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 6b47401c558..763ed658af8 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
index 6e57a81dc29..6e57a81dc29 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/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
index 89e40218623..89e40218623 100755
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
+++ b/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 5004a976bd3..c124bc27d21 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 01b088004bb..21fc62a4a82 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;
   };