* [bug#51030] [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
@ 2021-10-05 11:01 Brendan Tildesley
2021-11-12 5:49 ` bug#51030: " Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: Brendan Tildesley @ 2021-10-05 11:01 UTC (permalink / raw)
To: 51030
* 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")
--
2.33.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
2021-10-05 11:01 [bug#51030] [core-updates-frozen] build: qt-utils: Don't wrap .X-real files Brendan Tildesley
@ 2021-11-12 5:49 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2021-11-12 5:49 UTC (permalink / raw)
To: Brendan Tildesley; +Cc: 51030-done
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-12 5:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 11:01 [bug#51030] [core-updates-frozen] build: qt-utils: Don't wrap .X-real files Brendan Tildesley
2021-11-12 5:49 ` bug#51030: " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).