[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/149: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/149: build: qt-utils: Don't wrap .X-real files. |
Date: |
Tue, 26 Oct 2021 23:52:24 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 59c4652826bea185eb569f33bf6e8fc7b1ae88ed
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Tue Oct 5 22:01:06 2021 +1100
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>
---
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 c2b80ca..e86442b 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")
- 51/149: gnu: pulseaudio: Update to 15.0., (continued)
- 51/149: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/26
- 52/149: Revert commits made to resolve a gdk-pixbuf+svg propagation issue., guix-commits, 2021/10/26
- 55/149: gnu: abseil-cpp: Update to 20210324.2., guix-commits, 2021/10/26
- 56/149: gnu: mozjs-78: Update to 78.15.0., guix-commits, 2021/10/26
- 70/149: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/26
- 64/149: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/26
- 65/149: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/26
- 67/149: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/26
- 73/149: bluez: Update to 5.61., guix-commits, 2021/10/26
- 78/149: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/26
- 81/149: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 92/149: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/26
- 96/149: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/26
- 84/149: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/26
- 58/149: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/26
- 60/149: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/26
- 61/149: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/26
- 57/149: gnu: Add a missing copyright., guix-commits, 2021/10/26
- 62/149: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/26
- 66/149: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/26
- 63/149: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/26