diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/openkinect.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/openkinect.scm')
| -rw-r--r-- | gnu/packages/openkinect.scm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/openkinect.scm b/gnu/packages/openkinect.scm index 89e6c69cfc..e760f18367 100644 --- a/gnu/packages/openkinect.scm +++ b/gnu/packages/openkinect.scm @@ -64,9 +64,9 @@ (string-append rules-out "51-kinect.rules")) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("libusb" ,libusb))) + (list libusb)) (synopsis "Drivers and libraries for the Xbox Kinect device") (description "libfreenect is a userspace driver for the Microsoft Kinect. It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.") @@ -106,8 +106,7 @@ It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.") (inherit libfreenect) (name "libfreenect-opencv") (inputs - `(("libfreenect" ,libfreenect) - ("opencv" ,opencv))) + (list libfreenect opencv)) (arguments `(#:tests? #f ; package has no tests #:configure-flags '("-DBUILD_EXAMPLES=OFF" @@ -124,12 +123,11 @@ library"))) (inherit libfreenect) (name "python-libfreenect") (native-inputs - `(("python-cython" ,python-cython))) + (list python-cython)) (inputs - `(("libfreenect" ,libfreenect))) + (list libfreenect)) (propagated-inputs - `(("python" ,python) - ("python-numpy" ,python-numpy))) + (list python python-numpy)) (arguments `(#:tests? #f ; package has no tests #:configure-flags '("-DBUILD_EXAMPLES=OFF" |