[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/130: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/130: build: qt-utils: Don't wrap .X-real files. |
Date: |
Sat, 16 Oct 2021 02:36:35 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 8ded94275ee8c9ae95667381c267e09a66f3cc93
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")
- 57/130: gnu: Add a missing copyright., (continued)
- 57/130: gnu: Add a missing copyright., guix-commits, 2021/10/16
- 63/130: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/16
- 66/130: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/16
- 65/130: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/16
- 77/130: gnu: tzdata: Update to 2021c., guix-commits, 2021/10/16
- 78/130: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/16
- 74/130: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/16
- 75/130: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/16
- 82/130: gnu: curl: Honor #:tests?., guix-commits, 2021/10/16
- 84/130: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/16
- 81/130: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 90/130: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/16
- 89/130: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/16
- 87/130: gnu: gdb: Normalize indentation., guix-commits, 2021/10/16
- 97/130: gnu: Add python-flit-core., guix-commits, 2021/10/16
- 96/130: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/16
- 101/130: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/16
- 100/130: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/16
- 103/130: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/16
- 109/130: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 112/130: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/16