diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/packages/robotics.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/packages/robotics.scm')
| -rw-r--r-- | gnu/packages/robotics.scm | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 87dcc6f890..a110d0e6bd 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -51,14 +51,14 @@ (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs (list pkg-config)) (inputs ;; Optionally, add Python + Boost for Python bindings. - `(("sdl2" ,sdl2))) + (list sdl2)) (propagated-inputs ;; 'Viewer.h' includes 'QGLWidget'. - `(("qtbase" ,qtbase-5) ;the viewer module needs Qt5 + MESA - ("mesa" ,mesa))) + (list qtbase-5 ;the viewer module needs Qt5 + MESA + mesa)) (synopsis "Robot simulator") (description "Enki is a robot simulator written in C++. It provides collision and @@ -101,21 +101,20 @@ hundred times faster than real-time.") (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("valgrind" ,valgrind))) ;for tests + (list pkg-config valgrind)) ;for tests (inputs - `(("dashel" ,dashel) - ("enki" ,enki) - ("protobuf" ,protobuf-3.5) ;for logging - ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) - ("qttools" ,qttools) ;for libQt5Help, needed by "studio" - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("eudev" ,eudev) - ("libxml2" ,libxml2) - ("sdl2" ,sdl2) - ("avahi" ,avahi))) ;XXX: we need the libdnssd compat layer + (list dashel + enki + protobuf-3.5 ;for logging + qtbase-5 + qtsvg + qttools ;for libQt5Help, needed by "studio" + qtwebkit + qtx11extras + eudev + libxml2 + sdl2 + avahi)) ;XXX: we need the libdnssd compat layer (synopsis "Event-based robot programming tools") (description "Aseba means @dfn{actuator and sensor event-based architecture}. |