From 67a3b2dd4e1279e9c42d27a5d8829f13008033a4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 30 Oct 2016 08:15:23 +0100
Subject: [PATCH] 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 fe1bed17681..2c66eca3722 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -105,7 +105,8 @@ (define-public python-pyusb
(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 @@ (define-public python-pyusb
(("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
--
GitLab