[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/142: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/142: build: qt-utils: Don't wrap .X-real files. |
Date: |
Wed, 20 Oct 2021 14:56:44 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 29b561085b8875dda6016626f7c71f29d344ace5
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")
- 34/142: gnu: gnupg: Don't explicitly return #t from phases., (continued)
- 34/142: gnu: gnupg: Don't explicitly return #t from phases., guix-commits, 2021/10/20
- 36/142: gnu: python-sphinxcontrib-htmlhelp: Update to 2.0.0., guix-commits, 2021/10/20
- 38/142: gnu: python-sphinx: Update to 4.2.0., guix-commits, 2021/10/20
- 39/142: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/20
- 40/142: gnu: gstreamer: Update to 1.19.2., guix-commits, 2021/10/20
- 44/142: gnu: gst-plugins-bad: Update to 1.19.2., guix-commits, 2021/10/20
- 58/142: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/20
- 72/142: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/20
- 82/142: gnu: curl: Honor #:tests?., guix-commits, 2021/10/20
- 79/142: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/20
- 81/142: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 107/142: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/20
- 90/142: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/20
- 105/142: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/20
- 92/142: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/20
- 110/142: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/20
- 108/142: gnu: lsof: Fix indentation., guix-commits, 2021/10/20
- 127/142: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/20
- 14/142: gnu: librsvg-next: Do not propagate gdk-pixbuf., guix-commits, 2021/10/20
- 115/142: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/20
- 30/142: gnu: farstream: Enable tests., guix-commits, 2021/10/20