aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Tildesley <mail@brendan.scot>2020-09-13 15:45:57 +1000
committerLudovic Courtès <ludo@gnu.org>2021-04-22 14:04:28 +0200
commitc90a509dd9b12dc94804161bbe88f401df1dad76 (patch)
tree421f6c3854cbe3421bc60a4d01f0a55b927d89cc
parentb6753aa1e1041df0a787ec28e58384dc10a3c05c (diff)
downloadguix-c90a509dd9b12dc94804161bbe88f401df1dad76.tar.gz
guix-c90a509dd9b12dc94804161bbe88f401df1dad76.zip
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>
-rw-r--r--guix/build/qt-build-system.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm
index f59b0c420f..762fd8a2ee 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")