diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-18 05:21:41 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-18 17:35:48 +0100 |
| commit | 094313032ab9c2e3701280f68286fd2b27412213 (patch) | |
| tree | ad17ba3da96f4320c1f7d02e21c0c0632cb87ef7 | |
| parent | a8633f71cbdd4ec3f520f3425c8efa1006468c9f (diff) | |
| download | guix-patches-094313032ab9c2e3701280f68286fd2b27412213.tar guix-patches-094313032ab9c2e3701280f68286fd2b27412213.tar.gz | |
gnu: qtox: Remove input labels.
* gnu/packages/messaging.scm (qtox)[native-inputs]: Remove input labels.
[arguments]: Gexp, use SEARCH-INPUT-DIRECTORY, and don't explicitly
return #t from phases.
| -rw-r--r-- | gnu/packages/messaging.scm | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 016e236e28..68d95bd5fa 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -138,6 +138,7 @@ #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #: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")))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-reproducibility-issues - (lambda _ - (substitute* "src/main.cpp" - (("__DATE__") "\"\"") - (("__TIME__") "\"\"") - (("TIMESTAMP") "\"\"")) - #t)) - (add-after 'unpack 'disable-network-tests - (lambda _ - ;; These tests require network access. - (substitute* "cmake/Testing.cmake" - (("auto_test\\(core core\\)") "# auto_test(core core)") - (("auto_test\\(net bsu\\)") "# auto_test(net bsu)")) - #t)) - ;; Ensure that icons are found at runtime. - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/qtox") - `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") - "/lib/qt5/plugins/")))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-reproducibility-issues + (lambda _ + (substitute* "src/main.cpp" + (("__DATE__") "\"\"") + (("__TIME__") "\"\"") + (("TIMESTAMP") "\"\"")))) + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests require network access. + (substitute* "cmake/Testing.cmake" + (("auto_test\\(core core\\)") "# auto_test(core core)") + (("auto_test\\(net bsu\\)") "# auto_test(net bsu)")))) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/qtox") + `("QT_PLUGIN_PATH" prefix + ,(list (search-input-directory + inputs "lib/qt5/plugins/")))))))))) + (native-inputs + (list pkg-config qttools)) (inputs (list ffmpeg filteraudio @@ -1743,9 +1744,6 @@ instant messenger with audio and video chat capabilities.") qtbase-5 qtsvg sqlcipher)) - (native-inputs - `(("pkg-config" ,pkg-config) - ("qmake" ,qttools))) (home-page "https://qtox.github.io/") (synopsis "Tox chat client using Qt") (description "qTox is a Tox client that follows the Tox design |