kotatogram-desktop: 1.2 -> 1.4

This commit is contained in:
Ilya Fedin 2021-04-14 08:42:41 +04:00
parent ccabc238a8
commit c52a769c7f
2 changed files with 43 additions and 19 deletions

View File

@ -1,39 +1,62 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja { mkDerivation, lib, fetchFromGitHub, callPackage
, qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, xz, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, range-v3 , ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
}: }:
with lib; with lib;
mkDerivation rec { let
tg_owt = callPackage ../tdesktop/tg_owt.nix {};
in mkDerivation rec {
pname = "kotatogram-desktop"; pname = "kotatogram-desktop";
version = "1.2"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kotatogram"; owner = "kotatogram";
repo = "kotatogram-desktop"; repo = "kotatogram-desktop";
rev = "k${version}"; rev = "k${version}";
sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210"; sha256 = "0nhyjqxrbqiik4sgzplmpgx8msf8rykjiik0c2zr61rjm4fngkb3";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkg-config python3 cmake ninja ]; postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
'';
# We want to run wrapProgram manually (with additional parameters)
dontWrapGApps = true;
dontWrapQtApps = true;
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];
buildInputs = [ buildInputs = [
qtbase qtimageformats ffmpeg_3 openalSoft xz lz4 xxHash libdbusmenu qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell glibmm
tg_owt
# Transitive dependencies:
pcre xorg.libXdmcp util-linux libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie
]; ];
qtWrapperArgs = [ cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" ];
"--prefix PATH : ${xdg-utils}/bin"
];
cmakeFlags = [ postFixup = ''
"-DTDESKTOP_API_TEST=ON" # We also use gappsWrapperArgs from wrapGAppsHook.
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" wrapProgram $out/bin/kotatogram-desktop \
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" "''${gappsWrapperArgs[@]}" \
]; "''${qtWrapperArgs[@]}"
'';
passthru = {
inherit tg_owt;
};
meta = { meta = {
description = "Kotatogram experimental Telegram Desktop fork"; description = "Kotatogram experimental Telegram Desktop fork";
@ -45,6 +68,7 @@ mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
homepage = "https://kotatogram.github.io"; homepage = "https://kotatogram.github.io";
changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{ver}";
maintainers = with maintainers; [ ilya-fedin ]; maintainers = with maintainers; [ ilya-fedin ];
}; };
} }

View File

@ -23950,7 +23950,7 @@ in
kooha = callPackage ../applications/video/kooha { }; kooha = callPackage ../applications/video/kooha { };
kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
kpt = callPackage ../applications/networking/cluster/kpt { }; kpt = callPackage ../applications/networking/cluster/kpt { };