Merge pull request #110595 from rnhmjoj/nheko

nheko: build with VoIP support
This commit is contained in:
Michele Guerini Rocco 2021-02-23 18:24:16 +01:00 committed by GitHub
commit eb27b8efd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions

View file

@ -23,6 +23,9 @@
, olm
, pkg-config
, nlohmann_json
, voipSupport ? true
, gst_all_1
, libnice
}:
mkDerivation rec {
@ -59,12 +62,24 @@ mkDerivation rec {
qtquickcontrols2
qtgraphicaleffects
qtkeychain
] ++ lib.optional stdenv.isDarwin qtmacextras;
] ++ lib.optional stdenv.isDarwin qtmacextras
++ lib.optionals voipSupport (with gst_all_1; [
gstreamer
gst-plugins-base
(gst-plugins-good.override { qt5Support = true; })
gst-plugins-bad
libnice
]);
cmakeFlags = [
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
];
preFixup = lib.optionalString voipSupport ''
# add gstreamer plugins path to the wrapper
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';
meta = with lib; {
description = "Desktop client for the Matrix protocol";
homepage = "https://github.com/Nheko-Reborn/nheko";

View file

@ -156,6 +156,9 @@ stdenv.mkDerivation rec {
# fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
doCheck = false;
# must be explicitely set since 5590e365
dontWrapQtApps = true;
meta = with lib; {
description = "GStreamer Good Plugins";
homepage = "https://gstreamer.freedesktop.org";