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: 78da1c502b14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b66bbd84570
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 29, 2021

  1. tdesktop: 2.5.1 -> 2.5.7

    @primeos
    primeos committed Jan 29, 2021
    Copy the full SHA
    2b66bbd View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,12 +22,12 @@ let

in mkDerivation rec {
pname = "telegram-desktop";
version = "2.5.1";
version = "2.5.7";

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

postPatch = ''
@@ -44,7 +44,7 @@ in mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];

buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell
tg_owt
9 changes: 7 additions & 2 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
}:

let
rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de";
sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc";

in stdenv.mkDerivation {
pname = "tg_owt";
@@ -25,5 +25,10 @@ in stdenv.mkDerivation {
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
];

cmakeFlags = [
# Building as a shared library isn't officially supported and currently broken:
"-DBUILD_SHARED_LIBS=OFF"
];

meta.license = lib.licenses.bsd3;
}