diff options
author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2022-02-16 03:06:31 +0400 |
---|---|---|
committer | Ilya Fedin <fedin-ilja2010@ya.ru> | 2022-03-17 02:12:05 +0400 |
commit | d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0 (patch) | |
tree | ae9b096168c6eda45325e2a5c19c71dd388142cc /pkgs/applications/networking | |
parent | 1da5c564150c334ae6138d208091e8ec24c1eacf (diff) | |
download | nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar.gz nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar.bz2 nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar.lz nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar.xz nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.tar.zst nixpkgs-d5dc6828d5f0bd94ed63d744952cf4dcd6dcb5c0.zip |
kotatogram-desktop: apply nixpkgs-fmt
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix | 84 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 33 |
2 files changed, 96 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cb4f3e5e5d1..5e8a632cbd4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,18 +1,49 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook -, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk -# Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, libepoxy -, at-spi2-core, libXtst, libthai, libdatrie +{ mkDerivation +, lib +, fetchFromGitHub +, callPackage +, pkg-config +, cmake +, ninja +, python3 +, wrapGAppsHook +, wrapQtAppsHook +, qtbase +, qtimageformats +, gtk3 +, libsForQt5 +, lz4 +, xxHash +, ffmpeg +, openalSoft +, minizip +, libopus +, alsa-lib +, libpulseaudio +, range-v3 +, tl-expected +, hunspell +, glibmm +, webkitgtk + # Transitive dependencies: +, pcre +, xorg +, util-linux +, libselinux +, libsepol +, libepoxy +, at-spi2-core +, libXtst +, libthai +, libdatrie }: with lib; let - tg_owt = callPackage ./tg_owt.nix {}; -in mkDerivation rec { + tg_owt = callPackage ./tg_owt.nix { }; +in +mkDerivation rec { pname = "kotatogram-desktop"; version = "1.4.1"; @@ -36,13 +67,36 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk + qtbase + qtimageformats + gtk3 + libsForQt5.kwayland + libsForQt5.libdbusmenu + lz4 + xxHash + ffmpeg + openalSoft + minizip + libopus + alsa-lib + libpulseaudio + range-v3 + tl-expected + hunspell + glibmm + webkitgtk tg_owt # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy - at-spi2-core libXtst libthai libdatrie + pcre + xorg.libXdmcp + util-linux + libselinux + libsepol + libepoxy + at-spi2-core + libXtst + libthai + libdatrie ]; cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index aff74a174b9..757fda464fe 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,13 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf -, xorg, libXtst +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, ninja +, yasm +, libjpeg +, openssl +, libopus +, ffmpeg_4 +, alsa-lib +, libpulseaudio +, protobuf +, xorg +, libXtst }: let rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "tg_owt"; version = "git-${rev}"; @@ -23,8 +37,15 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf - xorg.libX11 libXtst + libjpeg + openssl + libopus + ffmpeg_4 + alsa-lib + libpulseaudio + protobuf + xorg.libX11 + libXtst ]; cmakeFlags = [ |