From: Brendan Tildesley <mail@brendan.scot>
To: 50862@debbugs.gnu.org
Subject: [bug#50862] [PATCH core-updates-frozen 01/19] build: qt-utils: Don't wrap .X-real files.
Date: Fri, 15 Oct 2021 20:29:57 +1100 [thread overview]
Message-ID: <20211015093015.5834-2-mail@brendan.scot> (raw)
In-Reply-To: <20211015093015.5834-1-mail@brendan.scot>
* 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
next prev parent reply other threads:[~2021-10-15 9:37 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 5:24 [bug#50862] [PATCHES] KDE updates Brendan Tildesley
2021-10-15 9:29 ` [bug#50862] [PATCH core-updates-frozen 00/19] Brendan Tildesley
2021-10-15 9:29 ` Brendan Tildesley [this message]
2021-10-15 9:29 ` [bug#50862] [PATCH core-updates-frozen 02/19] gnu: libdbusmenu-qt: Move (gnu packages qt) Brendan Tildesley
2021-10-15 9:29 ` [bug#50862] [PATCH core-updates-frozen 03/19] gnu: Add plasma-wayland-protocols Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 04/19] gnu: kdav: Move to (gnu packages kde-frameworks) Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 05/19] gnu: kdav: Update to 5.87.0 Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 06/19] gnu: KDE Frameworks: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 07/19] gnu: Add layer-shell-qt Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 08/19] gnu: KDE Plasma: Update to 5.22.5 Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 09/19] gnu: libgravatar: Move to (gnu packages kde-pim) Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 10/19] gnu: KDE PIM: Update to 21.08.2 Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 11/19] gnu: KDE: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 12/19] gnu: Remove libraw-0.18 Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 13/19] gnu: KDE Internet: Update to 21.08.2 Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 14/19] gnu: KDE Utils: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 15/19] gnu: KDE System Tools: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 16/19] gnu: KDE Multimedia: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 17/19] gnu: ktouch: " Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 18/19] gnu: Move KDE games to (gnu packages kde-games) Brendan Tildesley
2021-10-15 9:30 ` [bug#50862] [PATCH core-updates-frozen 19/19] gnu: KDE Games: Update to 21.08.2 Brendan Tildesley
2022-01-28 17:47 ` [bug#50862] [PATCH v3 01/10] gnu: extra-cmake-modules: Update to 5.90.0 phodina via Guix-patches via
2022-01-29 19:55 ` Leo Famulari
2022-01-29 19:58 ` Leo Famulari
2022-02-04 9:25 ` [bug#50862] [PATCHES] KDE updates phodina via Guix-patches via
2022-02-06 8:10 ` [bug#50862] PATCHES] KDE updates (5.90, 22.12.2) Brendan Tildesley
2022-02-06 8:30 ` phodina via Guix-patches via
2022-02-06 10:40 ` Brendan Tildesley
2022-03-16 5:42 ` [bug#50862] [PATCHES] " Brendan Tildesley
2022-03-16 11:01 ` Maxime Devos
2022-03-16 11:03 ` Maxime Devos
2022-04-14 16:04 ` phodina via Guix-patches via
2022-04-19 2:50 ` Brendan Tildesley
2022-07-26 17:47 ` phodina via Guix-patches via
2022-08-07 11:05 ` [bug#50862] [PATCHESv3] " phodina via Guix-patches via
2022-08-14 3:01 ` Maxim Cournoyer
2022-05-03 9:45 ` [bug#50862] [PATCHES] KDE updates guix-patches--- via
2022-05-12 2:44 ` Anthony Wang via Guix-patches via
2022-08-14 9:51 ` [bug#50862] [PATCHESv4] " phodina via Guix-patches via
2022-08-29 5:54 ` Brendan Tildesley
2022-08-31 21:10 ` Marius Bakke
2022-09-01 8:03 ` phodina via Guix-patches via
2022-09-01 14:23 ` Marius Bakke
2022-09-01 15:36 ` bug#50862: " Marius Bakke
2022-08-20 14:13 ` [bug#50862] [PATCHES] " guix-patches--- via
2022-08-21 14:49 ` guix-patches--- via
2022-08-22 13:19 ` [bug#50862] Launching the KDE Plasma session phodina via Guix-patches via
2022-08-27 21:14 ` phodina via Guix-patches via
2022-08-31 16:36 ` [bug#50862] [PATCHES] KDE updates guix-patches--- via
2022-08-31 21:02 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211015093015.5834-2-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=50862@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).