aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2022-01-22 01:08:24 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2022-01-22 01:08:24 +0100
commitf997af9c6fea3633422b2479f4602ee30e4d97c6 (patch)
treedf1f08407043dfd12e33ff39071700aba087af29 /gnu
parent98a322e02ef1d6c834fdb16a84162882245c0da2 (diff)
downloadguix-f997af9c6fea3633422b2479f4602ee30e4d97c6.tar.gz
guix-f997af9c6fea3633422b2479f4602ee30e4d97c6.zip
gnu: nheko: Fix build.
* gnu/packages/messaging.scm (nheko)[arguments]: Use G-expressions.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/messaging.scm80
1 files changed, 40 insertions, 40 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a8490a557e..768642f119 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2349,43 +2349,43 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
'(begin
(delete-file-recursively "third_party")))))
(arguments
- `(#:tests? #f ;no test target
- #:configure-flags
- '("-DCMAKE_BUILD_TYPE=Release"
- "-DBUILD_DOCS=ON"
- ;; Fix required because we are using a static SingleApplication
- "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" "
- ;; Compile Qml will make Nheko faster, but you will need to recompile
- ;; it, when you update Qt. That's fine for us.
- "-DCOMPILE_QML=ON")
- #:phases
- (modify-phases %standard-phases
- (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 correct 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"))))))
- (add-after 'unpack 'fix-determinism
- (lambda _
- ;; Make Qt deterministic.
- (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
- (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)))))))))
+ (list
+ #:tests? #f ;no test target
+ #:configure-flags
+ #~(list "-DCMAKE_BUILD_TYPE=Release"
+ "-DBUILD_DOCS=ON"
+ ;; Fix required because we are using a static SingleApplication
+ "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" "
+ ;; Compile Qml will make Nheko faster, but you will need to recompile
+ ;; it, when you update Qt. That's fine for us.
+ "-DCOMPILE_QML=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'unbundle-dependencies
+ (lambda _
+ (let ((single-app #$(this-package-input "single-application-qt5")))
+ (substitute* "CMakeLists.txt"
+ ;; Remove include and source dirs,replace with the correct 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"))))))
+ (add-after 'unpack 'fix-determinism
+ (lambda _
+ ;; Make Qt deterministic.
+ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
+ (add-after 'install 'wrap-program
+ (lambda _
+ (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+ (wrap-program (string-append #$output "/bin/nheko")
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
(build-system qt-build-system)
(inputs
(list boost
@@ -2395,11 +2395,11 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
coeurl
curl
gst-plugins-base
- gst-plugins-bad ; sdp & webrtc for voip
- gst-plugins-good ; rtpmanager for voip
+ gst-plugins-bad ; sdp & webrtc for voip
+ gst-plugins-good ; rtpmanager for voip
json-modern-cxx
libevent
- libnice ; for voip
+ libnice ; for voip
libolm
lmdb
lmdbxx