gnu: python2-scikit-image: Use strip-python2-variant.

* gnu/packages/python.scm (python2-scikit-image): Inherit using
strip-python2-variant.
[propagated-inputs]: Remove work-around for python2-matplotlib,
python2-numpy, python2-scipy.

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 06de46b..dd59be8 100644 (file)
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2919,21 +2919,19 @@ mining and data analysis.")
     (synopsis "Image processing in Python")
     (description
      "Scikit-image is a collection of algorithms for image processing.")
-    (license license:bsd-3)))
+    (license license:bsd-3)
+    (properties `((python2-variant . ,(delay python2-scikit-image))))))
 
 (define-public python2-scikit-image
-  (let ((scikit-image (package-with-python2 python-scikit-image)))
+  (let ((scikit-image (package-with-python2
+                        (strip-python2-variant python-scikit-image))))
     (package (inherit scikit-image)
       (native-inputs
        `(("python2-mock" ,python2-mock)
          ,@(package-native-inputs scikit-image)))
       (propagated-inputs
        `(("python2-pytz" ,python2-pytz)
-         ("python2-matplotlib" ,python2-matplotlib)
-         ("python2-numpy" ,python2-numpy)
-         ("python2-scipy" ,python2-scipy)
-         ,@(fold alist-delete (package-propagated-inputs scikit-image)
-                 '("python-matplotlib" "python-numpy" "python-scipy")))))))
+         ,@(package-propagated-inputs scikit-image))))))
 
 (define-public python-redis
   (package