summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2016-10-30 08:15:23 +0100
committerRicardo Wurmus <rekado@elephly.net>2016-10-30 18:57:18 +0100
commit67a3b2dd4e1279e9c42d27a5d8829f13008033a4 (patch)
tree8ae1f7c04579fa252ad3c7eb2f72fabe468d287f
parentbae678296ab8eaaeea2c613862bf82efdfee128b (diff)
downloadguix-67a3b2dd4e1279e9c42d27a5d8829f13008033a4.tar.gz
gnu: python-pyusb: Prettify library substitution.
* gnu/packages/libusb.scm (python-pyusb)[arguments]: Use srfi-1 to make
the "fix-libusb-reference" phase clearer.
-rw-r--r--gnu/packages/libusb.scm11
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index fe1bed1768..2c66eca372 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -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