From 30dde2c50881870aee2485c003a67b970c634e5b Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:31:56 +0200 Subject: gnu: kdewebkit: Make some inputs native. * gnu/packages/kde-framework.scm (kdewebkit)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/kde-frameworks.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/kde-frameworks.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index aab54ec4fb..1790555ace 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -2448,7 +2449,8 @@ with su and ssh respectively.") "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) (inputs `(("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) @@ -2458,7 +2460,6 @@ with su and ssh respectively.") ("kservice" ,kservice) ("kwallet" ,kwallet) ("qtbase" ,qtbase) - ("qttools" ,qttools) ("qtwebkit" ,qtwebkit))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Integration for QtWebKit") -- cgit v1.2.3 From 36d5d8a1438e835e684c1192e1364ef9dd3c7a27 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:31:57 +0200 Subject: gnu: kiconthemes: Make some inputs native. * gnu/packages/kde-frameworks.scm (kiconthemes)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/kde-frameworks.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1790555ace..304dbee866 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2559,6 +2559,7 @@ window does not need focus for them to be activated.") (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools) ("shared-mime-info" ,shared-mime-info))) (inputs `(("karchive" ,karchive) @@ -2571,8 +2572,7 @@ window does not need focus for them to be activated.") ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qttools" ,qttools))) + ("qtsvg" ,qtsvg))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ecd3237ca8e8691ba845fa4b8fa000116b724e13 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:31:58 +0200 Subject: gnu: kio: Make some inputs native. * gnu/packages/kde-frameworks.scm (kio)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/kde-frameworks.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/kde-frameworks.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 304dbee866..d010027c1d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2687,6 +2687,7 @@ consumption.") ("solid" ,solid))) (native-inputs `(("dbus" ,dbus) + ("qttools" ,qttools) ("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(;; TODO: LibACL , @@ -2709,7 +2710,6 @@ consumption.") ("libxslt" ,libxslt) ("qtbase" ,qtbase) ("qtscript" ,qtscript) - ("qttools" ,qttools) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) (arguments -- cgit v1.2.3 From 1bb2ec7edcbd3f408cfbe750624c87812bd467d2 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:31:59 +0200 Subject: gnu: kplotting: Make some inputs native. * gnu/packages/kde-framework.scm (kplotting)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/kde-frameworks.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/kde-frameworks.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d010027c1d..e57fc27fbe 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -958,10 +958,10 @@ to flat and hierarchical lists.") "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) - (inputs - `(("qtbase" ,qtbase) + `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase))) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") (description "KPlotWidget is a QWidget-derived class that provides a virtual -- cgit v1.2.3 From 3496519f18dbd749d630b49989e2127f84b9918c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 23:32:00 +0200 Subject: gnu: kxmlgui: Make some inputs native. * gnu/packages/kde-framework.scm (kxmlgui)[inputs]: Move qttools from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/kde-frameworks.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e57fc27fbe..a586b26d7e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3242,7 +3242,8 @@ the passwords on KDE work spaces.") `(("kconfig" ,kconfig) ("kconfigwidgets" ,kconfigwidgets))) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) (inputs `(("attica" ,attica) ("kauth" ,kauth) @@ -3256,7 +3257,6 @@ the passwords on KDE work spaces.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) - ("qttools" ,qttools) ("sonnet" ,sonnet))) (arguments `(#:tests? #f ; FIXME: 1/5 tests fail. -- cgit v1.2.3