futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: qtox: Remove input labels.

Browse Source 
* gnu/packages/messaging.scm (qtox)[native-inputs]: Remove input labels.
[arguments]: Gexp, use SEARCH-INPUT-DIRECTORY, and don't explicitly
return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-18 05:21:41 +01:00
parent a8633f71cb
commit 094313032a
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnu/packages/messaging.scm
View File

@ -138,6 +138,7 @@
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix hg-download) #:use-module (guix hg-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -1702,30 +1703,30 @@ instant messenger with audio and video chat capabilities.")
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-reproducibility-issues (add-after 'unpack 'fix-reproducibility-issues
(lambda _ (lambda _
(substitute* "src/main.cpp" (substitute* "src/main.cpp"
(("__DATE__") "\"\"") (("__DATE__") "\"\"")
(("__TIME__") "\"\"") (("__TIME__") "\"\"")
(("TIMESTAMP") "\"\"")) (("TIMESTAMP") "\"\""))))
#t)) (add-after 'unpack 'disable-network-tests
(add-after 'unpack 'disable-network-tests (lambda _
(lambda _ ;; These tests require network access.
;; These tests require network access. (substitute* "cmake/Testing.cmake"
(substitute* "cmake/Testing.cmake" (("auto_test\\(core core\\)") "# auto_test(core core)")
(("auto_test\\(core core\\)") "# auto_test(core core)") (("auto_test\\(net bsu\\)") "# auto_test(net bsu)"))))
(("auto_test\\(net bsu\\)") "# auto_test(net bsu)")) ;; Ensure that icons are found at runtime.
#t)) (add-after 'install 'wrap-executable
;; Ensure that icons are found at runtime. (lambda* (#:key inputs outputs #:allow-other-keys)
(add-after 'install 'wrap-executable (let ((out (assoc-ref outputs "out")))
(lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append out "/bin/qtox")
(let ((out (assoc-ref outputs "out"))) `("QT_PLUGIN_PATH" prefix
(wrap-program (string-append out "/bin/qtox") ,(list (search-input-directory
`("QT_PLUGIN_PATH" prefix inputs "lib/qt5/plugins/"))))))))))
,(list (string-append (assoc-ref inputs "qtsvg") (native-inputs
"/lib/qt5/plugins/")))))))))) (list pkg-config qttools))
(inputs (inputs
(list ffmpeg (list ffmpeg
filteraudio filteraudio
@ -1743,9 +1744,6 @@ instant messenger with audio and video chat capabilities.")
qtbase-5 qtbase-5
qtsvg qtsvg
sqlcipher)) sqlcipher))
(native-inputs
`(("pkg-config" ,pkg-config)
("qmake" ,qttools)))
(home-page "https://qtox.github.io/") (home-page "https://qtox.github.io/")
(synopsis "Tox chat client using Qt") (synopsis "Tox chat client using Qt")
(description "qTox is a Tox client that follows the Tox design (description "qTox is a Tox client that follows the Tox design