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

Merge pull request #82883 from ilya-fedin/update-kotatogram

Browse Source 
kotatogram-desktop: 1.1.5 -> 1.2
This commit is contained in:
Alexey Shmalko 2020-04-12 15:02:41 +03:00 committed by GitHub
commit 5eca80f7eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -1,32 +1,28 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja
, qtbase, qtimageformats, enchant, xdg_utils, ffmpeg, openalSoft, lzma , qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft
, lz4, xxHash, zlib, minizip, openssl, libtgvoip, range-v3 , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected
, range-v3
}: }:
with lib; with lib;
mkDerivation rec { mkDerivation rec {
pname = "kotatogram-desktop"; pname = "kotatogram-desktop";
version = "1.1.5"; version = "1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kotatogram"; owner = "kotatogram";
repo = "kotatogram-desktop"; repo = "kotatogram-desktop";
rev = "k${version}"; rev = "k${version}";
sha256 = "1j5wn3k1mr2c39szmyzm0pf720jmbllcaj40p2ydx0p3lir1s760"; sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postPatch = ''
substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
--replace '"libenchant-2.so.2"' '"${enchant}/lib/libenchant-2.so.2"'
'';
nativeBuildInputs = [ pkg-config python3 cmake ninja ]; nativeBuildInputs = [ pkg-config python3 cmake ninja ];
buildInputs = [ buildInputs = [
qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu
zlib minizip openssl enchant libtgvoip range-v3 zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
@ -35,8 +31,8 @@ mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DTDESKTOP_API_TEST=ON" "-DTDESKTOP_API_TEST=ON"
"-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
]; ];
meta = { meta = {

6
pkgs/development/libraries/libtgvoip/default.nix
View File

@ -6,13 +6,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libtgvoip"; pname = "libtgvoip";
version = "unstable-2020-01-21"; version = "unstable-2020-03-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "telegramdesktop"; owner = "telegramdesktop";
repo = "libtgvoip"; repo = "libtgvoip";
rev = "ade4434f1c6efabecc3b548ca1f692f8d103d22a"; rev = "e422d2a80546a32ab7166a9b1058bacfc5daeefc";
sha256 = "1bhnx3sknadx7a4qk9flh356kffb02xx32grj7cj7ik4rarccgp0"; sha256 = "0n6f7215k74039j0zmicjzhj6f45mq6fvkrwzyzibcrv87ib17fc";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];