[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: jami-qt: Remove the custom wrap phase.
From: |
guix-commits |
Subject: |
02/02: gnu: jami-qt: Remove the custom wrap phase. |
Date: |
Sat, 10 Apr 2021 00:56:34 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 59134f1e02dbde6d82e6204b51ca49347b8037d9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Apr 9 23:20:18 2021 -0400
gnu: jami-qt: Remove the custom wrap phase.
Commit 06eb21856f made it necessary, since it is now handled by the Qt build
system itself.
* gnu/packages/jami.scm (jami-qt)[phases]{wrap}: Remove phase.
---
gnu/packages/jami.scm | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 42b15ce..0adc3ed 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -585,25 +585,13 @@ decentralized calling using P2P-DHT.")
(outputs '("out" "debug"))
(arguments
`(#:tests? #f ;no test suite
- #:phases
- (modify-phases %standard-phases
- ;; TODO: Uncomment after switching back to the tarball source.
- ;; (add-after 'unpack 'change-directory
- ;; (lambda _
- ;; (chdir "client-qt")))
- (add-after 'install 'wrap
- ;; The program fails to find the QtWebEngineProcess program, so we
- ;; set QTWEBENGINEPROCESS_PATH to help it.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
- (qtwebengineprocess (string-append
- (assoc-ref inputs "qtwebengine")
-
"/lib/qt5/libexec/QtWebEngineProcess")))
- (for-each (lambda (program)
- (wrap-program program
- `("QTWEBENGINEPROCESS_PATH" =
- (,qtwebengineprocess))))
- (find-files bin ".*"))))))))
+ ;; TODO: Uncomment after switching back to the tarball source.
+ ;; #:phases
+ ;; (modify-phases %standard-phases
+ ;; (add-after 'unpack 'change-directory
+ ;; (lambda _
+ ;; (chdir "client-qt"))))
+ ))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)