apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 69d4d4b4f2ab096156ee2441ecc9cfdee195b8d7 Author: Brendan Tildesley <[email protected]> AuthorDate: Tue Oct 5 22:01:06 2021 +1100 build: qt-utils: Don't wrap .X-real files. * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped programs. This is forbidden in wrap-program now due to a738a663a99. Signed-off-by: Maxim Cournoyer <[email protected]> --- guix/build/qt-utils.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80ca..e86442b 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <[email protected]> ;;; Copyright © 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2021 Maxim Cournoyer <[email protected]> +;;; Copyright © 2021 Brendan Tildesley <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap output-dir) (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))) (list (string-append output-dir "/bin") (string-append output-dir "/sbin") (string-append output-dir "/libexec")
