06/07: qt-build-system: Don't double wrap programs.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit c90a509dd9b12dc94804161bbe88f401df1dad76
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Sun Sep 13 15:45:57 2020 +1000

    qt-build-system: Don't double wrap programs.
    
    * guix/build/qt-build-system.scm (wrap-all-programs): Excluded wrapped
    programs from the list of files to wrap if they exist to avoid double
    wrapping.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/build/qt-build-system.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm
index f59b0c4..762fd8a 100644
--- a/guix/build/qt-build-system.scm
+++ b/guix/build/qt-build-system.scm
@@ -111,7 +111,10 @@ add a dependency of that output on Qt."
   (define (find-files-to-wrap directory)
     (append-map
      (lambda (dir)
-       (if (directory-exists? dir) (find-files dir ".*") (list)))
+       (if (directory-exists? dir)
+           (find-files dir (lambda (file stat)
+                             (not (wrapped-program? file))))
+           '()))
      (list (string-append directory "/bin")
            (string-append directory "/sbin")
            (string-append directory "/libexec")