From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 48083@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#48083] [PATCH 1/3] gnu: webrtc-for-telegram-desktop: Use usrsctp from guix instead of from third-party.
Date: Wed, 28 Apr 2021 12:51:39 -0400 [thread overview]
Message-ID: <20210428165141.27183-1-rg@raghavgururajan.name> (raw)
In-Reply-To: <e893f76b-da0c-5b51-8a03-86e22d56066d@raghavgururajan.name>
UsrSCTP is now available in Guix (f5e69549ba5d6efcd03f4f50f771a8a76ed73c5b).
* gnu/packages/telegram.scm (webrtc-for-telegram-desktop)
[snippet]: Remove usrsctp from keep list.
[phases](patch-cmake): New phase.
---
gnu/packages/telegram.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index e6bfe6c4f2..cf5c173973 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -44,6 +44,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages lxqt)
#:use-module (gnu packages lua)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
@@ -96,7 +97,7 @@
'( ;; Custom forks which are incompatible with the ones in Guix.
"abseil-cpp" "libsrtp" "openh264" "rnnoise"
;; Not available in Guix.
- "pffft" "usrsctp"
+ "pffft"
;; Has cmake support files for libvpx input.
"libvpx")))
(with-directory-excursion "src/third_party"
@@ -124,9 +125,22 @@
"/src/third_party/libyuv")))
(copy-recursively libvpx-from libvpx-to)
(copy-recursively libyuv-from libyuv-to))
- #t)))))
+ #t))
+ (add-after 'copy-inputs 'patch-cmake
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "CMakeLists.txt"
+ ;; Disable building of usrsctp as thirdparty,
+ ;; as we removed its source.
+ (("include\\(cmake/libusrsctp.cmake\\)") "")
+ ;; Link to usrsctp that is provided as input,
+ ;; instead of linking to usrsctp that is supossedly
+ ;; built as thirdparty.
+ (("tg_owt::libusrsctp") "usrsctp")
+ ;; Disable exporting of usrsctp,
+ ;; that is supossedly built as thirdparty.
+ (("[ \t]*libusrsctp") "")))))))
(native-inputs
- `(("gcc" ,gcc-9) ; keep in line with telegram-desktop
+ `(("gcc" ,gcc-9) ; keep in line with telegram-desktop
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
@@ -161,6 +175,7 @@
("opus" ,opus)
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
+ ("usrsctp" ,usrsctp)
("x11" ,libx11)
("xext" ,libxext)
("xtst" ,libxtst)))
--
2.31.1
next prev parent reply other threads:[~2021-04-28 16:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 16:50 [bug#48083] [PATCH 0/0]: Changes to Telegram Stuff Raghav Gururajan via Guix-patches via
2021-04-28 16:51 ` Raghav Gururajan via Guix-patches via [this message]
2021-04-28 16:51 ` [bug#48083] [PATCH 2/3] gnu: webrtc-for-telegram-desktop: Update to 0-96.18cb4cd Raghav Gururajan via Guix-patches via
2021-05-14 10:32 ` [bug#48083] [PATCH 0/0]: Changes to Telegram Stuff Ludovic Courtès
2021-04-28 16:51 ` [bug#48083] [PATCH 3/3] gnu: telegram-desktop: Update to 2.7.3 Raghav Gururajan via Guix-patches via
2021-05-14 10:33 ` [bug#48083] [PATCH 0/0]: Changes to Telegram Stuff Ludovic Courtès
2021-05-14 10:30 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210428165141.27183-1-rg@raghavgururajan.name \
--to=guix-patches@gnu.org \
--cc=48083@debbugs.gnu.org \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.