[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#43367] [PATCH 5/5] qt-build-system: Don't double wrap programs.
From: |
Brendan Tildesley |
Subject: |
[bug#43367] [PATCH 5/5] qt-build-system: Don't double wrap programs. |
Date: |
Sun, 13 Sep 2020 15:45:57 +1000 |
* 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.
---
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 005157b0a4..4738ca09c9 100644
--- a/guix/build/qt-build-system.scm
+++ b/guix/build/qt-build-system.scm
@@ -83,7 +83,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")
--
2.28.0