git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110595 from rnhmjoj/nheko

nheko: build with VoIP support

commiteb27b8efd7554cd2f2ee60b632de94fcf04f8d0f authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com> dateTue 23 Feb 2021, 18:24 (6 years ago) parent74b34f4bc1f67f
2 files changed+19−1
pkgs/applications/networking/instant-messengers/nheko/default.nix+16−1 pkgs/development/libraries/gstreamer/good/default.nix+3
pkgs/applications/networking/instant-messengers/nheko/default.nix+16−1
@@ -23,6 +23,9 @@
2323, olm
2424, pkg-config
2525, nlohmann_json
26+, voipSupport ? true
27+, gst_all_1
28+, libnice
2629}:
2730
2831mkDerivation rec {
@@ -59,12 +62,24 @@ mkDerivation rec {
5962 qtquickcontrols2
6063 qtgraphicaleffects
6164 qtkeychain
62− ] ++ lib.optional stdenv.isDarwin qtmacextras;
65+ ] ++ lib.optional stdenv.isDarwin qtmacextras
66+ ++ lib.optionals voipSupport (with gst_all_1; [
67+ gstreamer
68+ gst-plugins-base
69+ (gst-plugins-good.override { qt5Support = true; })
70+ gst-plugins-bad
71+ libnice
72+ ]);
6373
6474 cmakeFlags = [
6575 "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
6676 ];
6777
78+ preFixup = lib.optionalString voipSupport ''
79+ # add gstreamer plugins path to the wrapper
80+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
81+ '';
82+
6883 meta = with lib; {
6984 description = "Desktop client for the Matrix protocol";
7085 homepage = "https://github.com/Nheko-Reborn/nheko";
pkgs/development/libraries/gstreamer/good/default.nix+3
@@ -156,6 +156,9 @@ stdenv.mkDerivation rec {
156156 # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
157157 doCheck = false;
158158
159+ # must be explicitely set since 5590e365
160+ dontWrapQtApps = true;
161+
159162 meta = with lib; {
160163 description = "GStreamer Good Plugins";
161164 homepage = "https://gstreamer.freedesktop.org";