diff options
| author | Vinicius Monego <monego@posteo.net> | 2021-11-27 13:21:53 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-11-27 14:27:23 +0100 |
| commit | 0c7d3243393deedd85b471012fc543421c3e7671 (patch) | |
| tree | 0faff0b356d506bc1ade751a5030f2a184619965 /gnu | |
| parent | 4fbc19e2c004430af36e1595398ae958f62f1e24 (diff) | |
gnu: marble-qt: Add optional dependencies.
* gnu/packages/kde.scm (marble-qt)[arguments]<#:configure-flags>: Remove
"-DCMAKE_BUILD_TYPE=Release" and "-DWITH_KF5=FALSE". Add
"-DBUILD_MARBLE_TOOLS=YES" and "-DBUILD_TOUCH=YES".
[native-inputs]: Add extra-cmake-modules.
[inputs]: Sort alphabetically. Add gpsd, kcoreaddons, kcrash, kdoctools,
ki18n, kio, knewstuff, kparts, krunner, kwallet, perl, phonon, protobuf,
qtserialport, qtsvg, shapelib, shared-mime-info, zlib. Remove qtwebkit.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/kde.scm | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 886d8f60256..20916cf164c 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm | |||
| @@ -57,10 +57,12 @@ | |||
| 57 | #:use-module (gnu packages ebook) | 57 | #:use-module (gnu packages ebook) |
| 58 | #:use-module (gnu packages flex) | 58 | #:use-module (gnu packages flex) |
| 59 | #:use-module (gnu packages fontutils) | 59 | #:use-module (gnu packages fontutils) |
| 60 | #:use-module (gnu packages geo) | ||
| 60 | #:use-module (gnu packages gettext) | 61 | #:use-module (gnu packages gettext) |
| 61 | #:use-module (gnu packages ghostscript) | 62 | #:use-module (gnu packages ghostscript) |
| 62 | #:use-module (gnu packages gl) | 63 | #:use-module (gnu packages gl) |
| 63 | #:use-module (gnu packages gnome) | 64 | #:use-module (gnu packages gnome) |
| 65 | #:use-module (gnu packages gps) | ||
| 64 | #:use-module (gnu packages graphics) | 66 | #:use-module (gnu packages graphics) |
| 65 | #:use-module (gnu packages image) | 67 | #:use-module (gnu packages image) |
| 66 | #:use-module (gnu packages kde-frameworks) | 68 | #:use-module (gnu packages kde-frameworks) |
| @@ -74,6 +76,7 @@ | |||
| 74 | #:use-module (gnu packages perl) | 76 | #:use-module (gnu packages perl) |
| 75 | #:use-module (gnu packages photo) | 77 | #:use-module (gnu packages photo) |
| 76 | #:use-module (gnu packages pkg-config) | 78 | #:use-module (gnu packages pkg-config) |
| 79 | #:use-module (gnu packages protobuf) | ||
| 77 | #:use-module (gnu packages pulseaudio) | 80 | #:use-module (gnu packages pulseaudio) |
| 78 | #:use-module (gnu packages python) | 81 | #:use-module (gnu packages python) |
| 79 | #:use-module (gnu packages tls) | 82 | #:use-module (gnu packages tls) |
| @@ -1006,17 +1009,36 @@ Python, PHP, and Perl.") | |||
| 1006 | ;; corresponding configure flag to build tests. | 1009 | ;; corresponding configure flag to build tests. |
| 1007 | `(#:tests? #f | 1010 | `(#:tests? #f |
| 1008 | #:configure-flags | 1011 | #:configure-flags |
| 1009 | '("-DCMAKE_BUILD_TYPE=Release" | 1012 | (list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools |
| 1010 | "-DWITH_KF5=FALSE" | 1013 | "-DBUILD_TOUCH=YES" |
| 1011 | "-DBUILD_MARBLE_TESTS=FALSE"))) | 1014 | "-DBUILD_MARBLE_TESTS=FALSE"))) |
| 1012 | (native-inputs | 1015 | (native-inputs |
| 1013 | `(("qttools" ,qttools))) | 1016 | `(("extra-cmake-modules" ,extra-cmake-modules) |
| 1017 | ("qttools" ,qttools))) | ||
| 1018 | ;; One optional dependency missing: libwlocate. | ||
| 1014 | (inputs | 1019 | (inputs |
| 1015 | `(("qtbase" ,qtbase-5) | 1020 | `(("gpsd" ,gpsd) |
| 1016 | ("qtsvg" ,qtsvg) | 1021 | ("kcoreaddons" ,kcoreaddons) |
| 1022 | ("kcrash" ,kcrash) | ||
| 1023 | ("kdoctools" ,kdoctools) | ||
| 1024 | ("ki18n" ,ki18n) | ||
| 1025 | ("kio" ,kio) | ||
| 1026 | ("knewstuff" ,knewstuff) | ||
| 1027 | ("kparts" ,kparts) | ||
| 1028 | ("krunner" ,krunner) | ||
| 1029 | ("kwallet" ,kwallet) | ||
| 1030 | ("perl" ,perl) | ||
| 1031 | ("phonon" ,phonon) | ||
| 1032 | ("protobuf" ,protobuf) | ||
| 1033 | ("qtbase" ,qtbase-5) | ||
| 1017 | ("qtdeclarative" ,qtdeclarative) | 1034 | ("qtdeclarative" ,qtdeclarative) |
| 1018 | ("qtwebkit" ,qtwebkit) | 1035 | ("qtlocation" ,qtlocation) |
| 1019 | ("qtlocation" ,qtlocation))) | 1036 | ("qtserialport" ,qtserialport) |
| 1037 | ("qtsvg" ,qtsvg) | ||
| 1038 | ;; ("qtwebengine" ,qtwebengine) ; FIXME: not found by CMake | ||
| 1039 | ("shapelib" ,shapelib) | ||
| 1040 | ("shared-mime-info" ,shared-mime-info) | ||
| 1041 | ("zlib" ,zlib))) | ||
| 1020 | (home-page "https://marble.kde.org/") | 1042 | (home-page "https://marble.kde.org/") |
| 1021 | (synopsis "Virtual globe and world atlas") | 1043 | (synopsis "Virtual globe and world atlas") |
| 1022 | (description "Marble is similar to a desktop globe. At closer scale it | 1044 | (description "Marble is similar to a desktop globe. At closer scale it |
