diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/robotics.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/robotics.scm')
| -rw-r--r-- | gnu/packages/robotics.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index fbf10be366..87dcc6f890 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -57,7 +57,7 @@ `(("sdl2" ,sdl2))) (propagated-inputs ;; 'Viewer.h' includes 'QGLWidget'. - `(("qtbase" ,qtbase) ;the viewer module needs Qt5 + MESA + `(("qtbase" ,qtbase-5) ;the viewer module needs Qt5 + MESA ("mesa" ,mesa))) (synopsis "Robot simulator") (description @@ -107,7 +107,7 @@ hundred times faster than real-time.") `(("dashel" ,dashel) ("enki" ,enki) ("protobuf" ,protobuf-3.5) ;for logging - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qttools" ,qttools) ;for libQt5Help, needed by "studio" ("qtwebkit" ,qtwebkit) |