[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50862] [PATCH core-updates-frozen 01/19] build: qt-utils: Don't wra
From: |
Brendan Tildesley |
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 |
* 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
- [bug#50862] [PATCH core-updates-frozen 05/19] gnu: kdav: Update to 5.87.0., (continued)
- [bug#50862] [PATCH core-updates-frozen 05/19] gnu: kdav: Update to 5.87.0., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 09/19] gnu: libgravatar: Move to (gnu packages kde-pim)., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 08/19] gnu: KDE Plasma: Update to 5.22.5., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 02/19] gnu: libdbusmenu-qt: Move (gnu packages qt)., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 04/19] gnu: kdav: Move to (gnu packages kde-frameworks)., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 06/19] gnu: KDE Frameworks: Update to 5.87.0., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 07/19] gnu: Add layer-shell-qt., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 12/19] gnu: Remove libraw-0.18., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 11/19] gnu: KDE: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 03/19] gnu: Add plasma-wayland-protocols., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 01/19] build: qt-utils: Don't wrap .X-real files.,
Brendan Tildesley <=
- [bug#50862] [PATCH core-updates-frozen 10/19] gnu: KDE PIM: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 13/19] gnu: KDE Internet: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 15/19] gnu: KDE System Tools: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 14/19] gnu: KDE Utils: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 16/19] gnu: KDE Multimedia: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 19/19] gnu: KDE Games: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 17/19] gnu: ktouch: Update to 21.08.2., Brendan Tildesley, 2021/10/15
- [bug#50862] [PATCH core-updates-frozen 18/19] gnu: Move KDE games to (gnu packages kde-games)., Brendan Tildesley, 2021/10/15