colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tdesktop: 2.4.7 -> 2.5.0

Browse Source 
TODO: Add a "dev" output for tdesktop.tg_owt (now built as a shared
library).
This commit is contained in:
Michael Weiss 2020-12-23 13:31:14 +01:00
parent b67ba0bfcc
commit 019eb959e3
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -22,12 +22,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
version = "2.4.7";
version = "2.5.0";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv";
sha256 = "08y6krzhg8hipl7zgyda7ifi2ydxylb2snkslr7w5yj43rvc7hxj";
};
postPatch = ''
@ -80,9 +80,6 @@ in mkDerivation rec {
# TODO: Package mapbox-variant
postFixup = ''
# Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers.
remove-references-to -t ${tg_owt} $out/bin/telegram-desktop
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
wrapProgram $out/bin/telegram-desktop \

13
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm
, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf
}:
let
rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
in stdenv.mkDerivation {
pname = "tg_owt";
@ -14,11 +14,14 @@ in stdenv.mkDerivation {
owner = "desktop-app";
repo = "tg_owt";
inherit rev sha256;
fetchSubmodules = true;
};
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];
buildInputs = [
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
];
meta.license = lib.licenses.bsd3;
}