diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-04-08 09:31:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-08 09:31:48 +0800 |
| commit | 4073ab0d956d50c879d74471aa5e3a8fa5c57cd4 (patch) | |
| tree | 0a2fa10334f3a2c5f5d7e429f453e783838c8bc7 /pkgs/top-level | |
| parent | b31b88d74fd95127be2b66fd169e2a7cb035f6d6 (diff) | |
| parent | e6c5f4cff886a131b74be494405e0d6a4c740518 (diff) | |
Merge pull request #225166 from SuperSandro2000/telegram-desktop
telegram-desktop: rename from tdesktop
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5004a976bd390..c124bc27d21bd 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 337f9039baef9..1f04873301814 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31395,7 +31395,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(_: { @@ -33936,7 +33936,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; }; |