diff options
| author | Brendan Tildesley <mail@brendan.scot> | 2021-10-05 22:01:06 +1100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 10:31:31 -0500 |
| commit | 3dfe45c3f10e31a016b22127eede8099ca4f4b8f (patch) | |
| tree | bbb07be18db5cba725a10a3c025a354c60d8f099 | |
| parent | 57fd6d511c678eeee88f254c511847a56f86f85f (diff) | |
| download | guix-3dfe45c3f10e31a016b22127eede8099ca4f4b8f.tar guix-3dfe45c3f10e31a016b22127eede8099ca4f4b8f.tar.gz | |
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 <maxim.cournoyer@gmail.com>
| -rw-r--r-- | guix/build/qt-utils.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..e86442b79f 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> ;;; ;;; 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") |