guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: python-pyusb: Prettify library substitution.


From: Ricardo Wurmus
Subject: 01/01: gnu: python-pyusb: Prettify library substitution.
Date: Sun, 30 Oct 2016 17:57:27 +0000 (UTC)

rekado pushed a commit to branch master
in repository guix.

commit 67a3b2dd4e1279e9c42d27a5d8829f13008033a4
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Oct 30 08:15:23 2016 +0100

    gnu: python-pyusb: Prettify library substitution.
    
    * gnu/packages/libusb.scm (python-pyusb)[arguments]: Use srfi-1 to make
    the "fix-libusb-reference" phase clearer.
---
 gnu/packages/libusb.scm |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index fe1bed1..2c66eca 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]