~ruther/guix-local: gnu: python-pyusb: Prettify library substitution.

67a3b2dd4e1279e9c42d27a5d8829f13008033a4 — Ricardo Wurmus 9 years ago bae6782

gnu: python-pyusb: Prettify library substitution.

* gnu/packages/libusb.scm (python-pyusb)[arguments]: Use srfi-1 to make
the "fix-libusb-reference" phase clearer.

patch browse .tar.gz

1 files changed, 5 insertions(+), 6 deletions(-)

M gnu/packages/libusb.scm

M gnu/packages/libusb.scm => gnu/packages/libusb.scm +5 -6

@@ 105,7 105,8 @@ version of libusb to run with newer libusb.")
     (build-system python-build-system)
     (arguments
      `(#:tests? #f  ;no tests
-       #:modules ((srfi srfi-26)
+       #:modules ((srfi srfi-1)
+                  (srfi srfi-26)
                   (guix build utils)
                   (guix build python-build-system))
        #:phases


@@ 116,11 117,9 @@ version of libusb to run with newer libusb.")
                (("lib = locate_library\\(candidates, find_library\\)")
                 (string-append
                  "lib = \""
-                 (car (find-files (assoc-ref inputs "libusb")
-                                  (lambda (file stat)
-                                    (and ((file-name-predicate
-                                           "^libusb-.*\\.so\\..*") file stat)
-                                         (not (symbolic-link? file))))))
+                 (find (negate symbolic-link?)
+                       (find-files (assoc-ref inputs "libusb")
+                                   "^libusb-.*\\.so\\..*"))
                  "\"")))
              #t)))))
     (inputs