diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/packages/kde-frameworks.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
| download | guix-322917aeb8e672c21378fd371a5cff4a9f0c2520.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/kde-frameworks.scm gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/kde-frameworks.scm')
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 87c9884284..20b30066a2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -730,7 +730,7 @@ replace the other outdated Graphviz tools.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland qtx11extras plasma-wayland-protocols wayland)) + (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user @@ -1051,7 +1051,7 @@ protocols used in KDE Plasma.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 plasma-wayland-protocols qtwayland wayland wayland-protocols)) + (list qtbase-5 plasma-wayland-protocols qtwayland-5 wayland wayland-protocols)) (arguments `(#:phases (modify-phases %standard-phases |