| Message ID | 20211005110106.11814-1-mail@brendan.scot |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#51030,core-updates-frozen] build: qt-utils: Don't wrap .X-real files. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
Hello, Brendan Tildesley <mail@brendan.scot> writes: > * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped > programs. This is forbidden in wrap-program now due to a738a663a99. > --- > 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 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") That's been merged in core-updates-frozen with commit 3dfe45c3f10e31a016b22127eede8099ca4f4b8f. Thank you! Closing. Maxim
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")