diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-02-23 18:24:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 18:24:16 +0100 |
| commit | eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f (patch) | |
| tree | 0d27dc92501416b794e6f105110ccf8d16666cef /pkgs | |
| parent | 74b34f4a1705763fff52febb9648ac6dc6d9e953 (diff) | |
| parent | bc1f67fefcbfd2632268be162a7162344248a93d (diff) | |
| download | nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar.gz nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar.bz2 nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar.lz nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar.xz nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.tar.zst nixlib-eb27b8efd7554cd2f2ee60b632de94fcf04f8d0f.zip | |
Merge pull request #110595 from rnhmjoj/nheko
nheko: build with VoIP support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 57db6a0750e9..927f89c94939 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"; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index cdf1660d4fa3..3ab25863a808 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"; |