Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c852b8d2c35
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c042fe9c8a3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 24, 2021

  1. tdesktop: 2.5.9 -> 2.6.0 

    This also adds libthai and libdatrie as optional dependencies for gtk3.
    @primeos
    primeos committed Feb 24, 2021
    Copy the full SHA
    2c042fe View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
14 changes: 8 additions & 6 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,9 @@
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell
# TODO: Shouldn't be required:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils
}:

@@ -22,12 +23,12 @@ let

in mkDerivation rec {
pname = "telegram-desktop";
version = "2.5.9";
version = "2.6.0";

# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1311dab9cil8hl1qlh01ynrczyjbldcsq1l6ibh818wb5lsgvvl2";
sha256 = "18ifmvll0nnmjf8ba6r23ri9i4fggy7k2dqs3qf4f52cklmlfj06";
};

postPatch = ''
@@ -48,8 +49,9 @@ in mkDerivation rec {
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell
tg_owt
# TODO: Shouldn't be required:
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst
# Transitive dependencies:
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie
];

cmakeFlags = [