kotatogram-desktop: apply nixpkgs-fmt

This commit is contained in:
Ilya Fedin
2022-03-17 02:12:05 +04:00
parent 1da5c56415
commit d5dc6828d5
2 changed files with 96 additions and 21 deletions
@@ -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" ];
@@ -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 = [