nheko: move to by-name and reformat

This commit is contained in:
rnhmjoj 2024-09-14 15:10:18 +02:00
parent 1b016ab476
commit 4312e5a93c
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 59 additions and 61 deletions

View File

@ -1,32 +1,27 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, asciidoc
, pkg-config
, boost179
, cmark
, coeurl
, curl
, kdsingleapplication
, libevent
, libsecret
, lmdb
, lmdbxx
, mtxclient
, nlohmann_json
, olm
, qtbase
, qtimageformats
, qtkeychain
, qtmultimedia
, qttools
, qtwayland
, re2
, spdlog
, wrapQtAppsHook
, gst_all_1
, libnice
{
lib,
stdenv,
fetchFromGitHub,
cmake,
asciidoc,
pkg-config,
boost179,
cmark,
coeurl,
curl,
kdsingleapplication,
libevent,
libsecret,
lmdb,
lmdbxx,
mtxclient,
nlohmann_json,
olm,
re2,
spdlog,
gst_all_1,
libnice,
qt6Packages,
}:
stdenv.mkDerivation rec {
@ -45,37 +40,38 @@ stdenv.mkDerivation rec {
cmake
lmdbxx
pkg-config
wrapQtAppsHook
qt6Packages.wrapQtAppsHook
];
buildInputs = [
boost179
cmark
coeurl
curl
kdsingleapplication
libevent
libsecret
lmdb
mtxclient
nlohmann_json
olm
qtbase
qtimageformats
qtkeychain
qtmultimedia
qttools
qtwayland
re2
spdlog
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
(gst-plugins-good.override { qt6Support = true; })
gst-plugins-bad
libnice
]);
buildInputs =
[
boost179
cmark
coeurl
curl
kdsingleapplication
libevent
libsecret
lmdb
mtxclient
nlohmann_json
olm
qt6Packages.qtbase
qt6Packages.qtimageformats
qt6Packages.qtkeychain
qt6Packages.qtmultimedia
qt6Packages.qttools
qt6Packages.qtwayland
re2
spdlog
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
(gst-plugins-good.override { qt6Support = true; })
gst-plugins-bad
libnice
]);
cmakeFlags = [
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
@ -91,7 +87,11 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Nheko-Reborn/nheko";
license = licenses.gpl3Plus;
mainProgram = "nheko";
maintainers = with maintainers; [ ekleog fpletz rnhmjoj ];
maintainers = with maintainers; [
ekleog
fpletz
rnhmjoj
];
platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

View File

@ -31589,8 +31589,6 @@ with pkgs;
ngt = callPackage ../development/libraries/ngt { };
nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };
notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };