futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: Rename 'wrapper?' to 'wrapped-program?'.

Browse Source 
* guix/build/utils.scm (wrap-program): The wrapper? procedure is
incorrectly named as it actually checks to see if prog is the
original program that was moved, not the wrapper.
* guix/build/python-build-system: (wrap): Use renamed wrapped-program?.
* gnu/packages/ebook.scm (calibre)[arguments]: Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Brendan Tildesley 2020-09-13 15:45:54 +10:00 committed by Ludovic Courtès
parent d115747362
commit b2b799e2d8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/ebook.scm
View File

@ -324,7 +324,7 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]")))
;; rather than create ..calibre-real-real-s. For more
;; information see: https://issues.guix.gnu.org/43249.
(find-files "." (lambda (file stat)
(not (wrapper? file)))))))
(not (wrapped-program? file)))))))
#t)))))
(home-page "https://calibre-ebook.com/")
(synopsis "E-book library management software")

2
guix/build/python-build-system.scm
View File

@ -225,7 +225,7 @@ running checks after installing the package."
(define (list-of-files dir)
(find-files dir (lambda (file stat)
(and (eq? 'regular (stat:type stat))
(not (wrapper? file))))))
(not (wrapped-program? file))))))
(define bindirs
(append-map (match-lambda

6
guix/build/utils.scm
View File

@ -96,7 +96,7 @@
patch-/usr/bin/file
fold-port-matches
remove-store-references
wrapper?
wrapped-program?
wrap-program
wrap-script
@ -1227,8 +1227,8 @@ known as `nuke-refs' in Nixpkgs."
(program wrap-error-program)
(type wrap-error-type))
(define (wrapper? prog)
"Return #t if PROG is a wrapper as produced by 'wrap-program'."
(define (wrapped-program? prog)
"Return #t if PROG is a program that was moved and wrapped by 'wrap-program'."
(and (file-exists? prog)
(let ((base (basename prog)))
(and (string-prefix? "." base)