From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KPuyBinoCWBFQQAA0tVLHw (envelope-from ) for ; Thu, 21 Jan 2021 20:46:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id mKqIAinoCWBRIQAAB5/wlQ (envelope-from ) for ; Thu, 21 Jan 2021 20:46:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F16D59403E6 for ; Thu, 21 Jan 2021 20:46:31 +0000 (UTC) Received: from localhost ([::1]:46752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2gqd-0003FI-0I for larch@yhetil.org; Thu, 21 Jan 2021 15:46:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2gqA-0003Ew-K8 for guix-patches@gnu.org; Thu, 21 Jan 2021 15:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2gqA-0007So-DM for guix-patches@gnu.org; Thu, 21 Jan 2021 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2gqA-0001Nx-Bs for guix-patches@gnu.org; Thu, 21 Jan 2021 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46013] [PATCH] gnu: nheko: Update to 0.8.0. Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Jan 2021 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Michael Rohleder Received: via spool by 46013-submit@debbugs.gnu.org id=B46013.16112619385285 (code B ref 46013); Thu, 21 Jan 2021 20:46:02 +0000 Received: (at 46013) by debbugs.gnu.org; 21 Jan 2021 20:45:38 +0000 Received: from localhost ([127.0.0.1]:59511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2gpc-0001My-2Q for submit@debbugs.gnu.org; Thu, 21 Jan 2021 15:45:38 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:54589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2gpa-0001Mj-7P for 46013@debbugs.gnu.org; Thu, 21 Jan 2021 15:45:27 -0500 Received: by mail-wm1-f45.google.com with SMTP id i63so2595734wma.4 for <46013@debbugs.gnu.org>; Thu, 21 Jan 2021 12:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=KPzA2oyKwADWDtBG8z6k7GHKB9x3mM6OpFZ0SuB33lU=; b=aJRlgtv0T96miQSX2jJtlECTt7re0J3nwYvwgM1M5forOE8GEK1QR+3ut2Hmm2o0nU eJAi43or+9AX6FDxaX3a8uP2ocna0ExTjFzoTyqiz0ISCglRnCu/eKk838+rgSRnDiwg pza3YPVw7tcDvr8p9bl3IcTvHtIjSjwBJcaf6jiwjTSuVHGOzMkINwYkLwkJ4xtYpqd/ +7kRNJgOkDYm2MorWtVtsbIRrUTVcsRhvZ9wdECkZtye6F4/BC315xxJMa3VpS6z8grH sCRDMt//NwiimXqkIY1UxvrUK6xDbJwsVKgvDH0BrlCTK2F9pfpJfzAT48WupnlUY6xX 4yXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=KPzA2oyKwADWDtBG8z6k7GHKB9x3mM6OpFZ0SuB33lU=; b=DndQa4K3HuL9l/YSK5kRX7YccGKAS/7RhU76tJVwbz0PoMmz8nEsgyu52wD11hFEHD CdEyHvMfiuI8+cVIz7irAn7+eqMGpOBGhTUGLQRyYHEbiRcJXfJDlfOdE0C9L/sIPMax REpz/SuPtKv24+PMiWeZxm62rMLOmxrGsmJiQgZFQRebe7R+4FCv8Ha3mcaOXS9ZQ4mR 470/BJOrxX9P6bLqexmoRFIPCYyG0lKA3wI1WCEMQYYsjy8jdi009nwmCgT1fKfpD7qj xIWzWaqyLFDBMSYA9K8bvYv1vbeoUArn561ynqxXGdZt3huCGkE2w7Gx+YsoJtM1HUW+ GqNA== X-Gm-Message-State: AOAM5337356FWEO30Z2TR1Ks/oeIKZB2rtUv2oGWpgnbF9Mmt0wEQhGA oFueGpQFhlHgJo0t9RUk5vX0GrQ39pg= X-Google-Smtp-Source: ABdhPJxKpc6y8bUQQM1LKkJYvqg4+Nx1Z+II7KQogrGdAqt7ki4QxcXYiea5j4oMLthe/Fk7r21G7w== X-Received: by 2002:a1c:f706:: with SMTP id v6mr993235wmh.85.1611261920327; Thu, 21 Jan 2021 12:45:20 -0800 (PST) Received: from guixSD (host-95-244-15-108.retail.telecomitalia.it. [95.244.15.108]) by smtp.gmail.com with ESMTPSA id x11sm9017676wmi.4.2021.01.21.12.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 12:45:18 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87r1me6p0e.fsf@rohleder.de> References: <20210121010323.3172-1-mike@rohleder.de> <871reeznv9.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87r1me6p0e.fsf@rohleder.de> Date: Thu, 21 Jan 2021 21:45:17 +0100 Message-ID: <87y2gmxbmq.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 46013@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=aJRlgtv0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F16D59403E6 X-Spam-Score: -1.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: dPQ3yXkaHZKK --=-=-= Content-Type: text/plain Michael Rohleder writes: > Hi Nicolo! Hi Michael & all, > I think, it might be better to base on your patches to not complicate > things even more. Done, I updated the copyright line for you, used your commit message (updated accordingly). > I think, the most important part missing in your patch is the wrapping > of the GST_PLUGIN variable. Otherwise gstreamer/voip doen't work at all. > (But this could also be added after bumping, I guess) With you wrapper phase (and adding gst-plugin-good) I got voip call working! For video calls, I get this: > Missing GStreamer plugins: opengl qmlgl But qmlgl should be in -good, so we should take a look at gstreamer to check why it is not included. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v2-0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 38be202dce880dd77a5ce774c0c8877bed84975e Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 10:08:20 +0100 Subject: [PATCH v2 1/4] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 45d3faeafb..2a03ec58c5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2020 Alexandros Theodotou ;;; Copyright =C2=A9 2020 Greg Hogan ;;; Copyright =C2=A9 2020 Brett Gilio +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages maths) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -475,6 +477,44 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + (package + (name "cpp-httplib") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1l9n58ml7sygy723ws0z6brdbx4spc6fya6vgim11hpiy5b7zdkx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key source #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (copy-file (string-append source "/test") "test") + (chmod "test" #o744) + (invoke "make")))))) + (native-inputs + `(("python" ,python) ; required to build shared lib + ;; required for tests + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ header-only HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file header-only cross +platform blocking HTTP/HTTPS library, easy to setup. Just include the +@file{httplib.h} file in your code!") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v2-0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From 8fb37dd519fcc7038e54cdc858310983e29770f1 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH v2 2/4] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 935333dee2..d633b2aeab 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,6 +28,7 @@ ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020 Vinicius Monego +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -1996,6 +1998,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v2-0003-gnu-Add-single-application-qt5.patch Content-Transfer-Encoding: quoted-printable >From 4cb222f16727f74ecc1550d72c3d52b20ab0d20b Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: [PATCH v2 3/4] gnu: Add single-application-qt5. * gnu/packages/qt.scm (single-application-qt5): New variable. --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..205d99c017 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1947,6 +1948,61 @@ using the Chromium browser project. The Chromium so= urce code has Google service and binaries removed, and adds modular support for using system libraries.= ") (license license:lgpl2.1+))) =20 +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need= to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=3DQApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qt))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for = Qt5 and Qt6. + +nKeeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primar= y) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v2-0004-gnu-nheko-Update-to-0.8.0.patch Content-Transfer-Encoding: quoted-printable >From da2f4404144dac9930faa3031e48fd8aae9053d1 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 18:00:51 +0100 Subject: [PATCH v2 4/4] gnu: nheko: Update to 0.8.0. * gnu/packages/messaging.scm (nheko): Update to 0.8.0. [source snippet]: Remove third_party folder. [arguments]: Remove -fpermissive flag, remove remove-Werror phase, add phase wrap-program and unbundle-dependencies. [inputs]: Add gst-plugins-base, gst-plugins-bad, libnice, qtkeychain, and unbundle blurhash, cpp-httplib and single-application. [native-inputs]: Add doxygen, graphviz used to build documentation. [description]: Simplify by removing the long list, add new features. (mtxclient): Update to 0.4.0. [arguments]: Remove set-home phase. --- gnu/packages/messaging.scm | 92 +++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 37 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c585326124..db41e436d7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,13 +18,13 @@ ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Reza Alizadeh Majd ;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Mason Hock -;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2020, 2021 Michael Rohleder ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2020 Robert Karszniewicz ;;; @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r")))) (arguments `(#:configure-flags (list @@ -2249,12 +2249,6 @@ QMatrixClient project.") (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encrypt= ion|Pushrules)") "# add_test")) - #t)) - (add-before 'configure 'set-home - (lambda _ - ;; Tries to create package registry file - ;; So, set HOME. - (setenv "HOME" "/tmp") #t))))) (build-system cmake-build-system) (inputs @@ -2277,7 +2271,7 @@ for the Matrix protocol. It is built on to of @code{= Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.7.2") + (version "0.8.0") (source (origin (method git-fetch) @@ -2286,30 +2280,64 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) + (base32 "00d6wx3lcgbks74jkdyifqxf8nlravqh88fyljd0sy7kzbah9msf")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party") + #t)))) (arguments `(#:tests? #f ;no test target #:configure-flags - (list - "-DCMAKE_BUILD_TYPE=3DRelease" - "-DCMAKE_CXX_FLAGS=3D-fpermissive") + '("-DCMAKE_BUILD_TYPE=3DRelease" + "-DBUILD_DOCS=3DON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS=3D \"-DQAPPLICATION_CLASS=3DQApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recom= pile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=3DON") #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-Werror - (lambda _ - (substitute* "CMakeLists.txt" - (("-Werror") "")) + (add-after 'unpack 'unbundle-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (let ((single-app (assoc-ref inputs "single-application"))) + (substitute* "CMakeLists.txt" + ;; Remove include and source dirs,replace with the correc= t one + (("third_party/blurhash/blurhash.cpp") "") + (("third_party/cpp-httplib-0.5.12") + (string-append "\"" single-app "/include\"")) + (("add_subdirectory.*third_party/SingleApplication.*") "") + ;; Link using the correct static/shared libs + (("SingleApplication::SingleApplication") + (string-append + ;; Dynamic libraries + "httplib" "\n" "blurhash" "\n" + ;; Static library + single-app "/lib/libSingleApplication.a")))) #t)) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t))))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/nheko") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) + #t)))))) (build-system qt-build-system) (inputs `(("boost" ,boost) + ("blurhash" ,blurhash) + ("cpp-httplib" ,cpp-httplib) ("cmark" ,cmark) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-bad" ,gst-plugins-bad) ; sdp & webrtc for voip + ("gst-plugins-good" ,gst-plugins-good) ; rtpmanager for voip ("json-modern-cxx" ,json-modern-cxx) + ("libnice" ,libnice) ; for voip ("libolm" ,libolm) ("lmdb" ,lmdb) ("lmdbxx" ,lmdbxx) @@ -2317,15 +2345,19 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) + ("single-application" ,single-application-qt5) ("tweeny" ,tweeny) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") @@ -2333,22 +2365,8 @@ for the Matrix protocol. It is built on to of @code= {Boost.Asio}.") Matrix protocol that feels more like a mainstream chat app and less like a= n IRC client. =20 -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent u= nencrypted). -@item User registration. -@item Creating, joining & leaving rooms. -@item Sending & receiving invites. -@item Sending & receiving files and emoji. -@item Typing notifications. -@item Username auto-completion. -@item Message & mention notifications. -@item Redacting messages. -@item Read receipts. -@item Basic communities support. -@item Room switcher (@key{ctrl-K}). -@item Light, Dark & System themes. -@end itemize") +Many matrix features are supported, including user registration, rooms, ty= ping +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) =20 (define-public quaternion --=20 2.29.2 --=-=-=--