[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/169: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/169: build: qt-utils: Don't wrap .X-real files. |
Date: |
Thu, 28 Oct 2021 02:08:34 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 69d4d4b4f2ab096156ee2441ecc9cfdee195b8d7
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")
- 46/169: gnu: gst-libav: Update to 1.19.2., (continued)
- 46/169: gnu: gst-libav: Update to 1.19.2., guix-commits, 2021/10/28
- 51/169: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/28
- 56/169: gnu: mozjs-78: Update to 78.15.0., guix-commits, 2021/10/28
- 59/169: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/28
- 65/169: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/28
- 70/169: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/28
- 74/169: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/28
- 73/169: bluez: Update to 5.61., guix-commits, 2021/10/28
- 80/169: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/28
- 82/169: gnu: curl: Honor #:tests?., guix-commits, 2021/10/28
- 81/169: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 83/169: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/28
- 84/169: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/28
- 87/169: gnu: gdb: Normalize indentation., guix-commits, 2021/10/28
- 92/169: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/28
- 30/169: gnu: farstream: Enable tests., guix-commits, 2021/10/28
- 45/169: gnu: gst-plugins-ugly: Update to 1.19.2., guix-commits, 2021/10/28
- 41/169: gnu: gst-plugins-base: Update to 1.19.2., guix-commits, 2021/10/28
- 43/169: gnu: zxing-cpp: Update to 1.2.0., guix-commits, 2021/10/28
- 48/169: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/28
- 64/169: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/28