From 59fb4293fc2ceb582e87d56388d86e165a686cb3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 23 Jan 2021 14:27:23 +0100 Subject: [PATCH 1/2] nheko: build with VoIP support --- .../instant-messengers/nheko/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 57db6a0750e..927f89c9493 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -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"; From bc1f67fefcbfd2632268be162a7162344248a93d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 23 Feb 2021 11:10:22 +0100 Subject: [PATCH 2/2] gst-plugins-good: fix build with Qt --- pkgs/development/libraries/gstreamer/good/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index cdf1660d4fa..3ab25863a80 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -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";