[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
82/115: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
82/115: build: qt-utils: Don't wrap .X-real files. |
Date: |
Fri, 15 Oct 2021 09:49:13 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 1e8d9de51c982a2069ae75ef542846aee2615356
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")
- 100/115: gnu: python-setuptools-scm: Update to 6.3.2, (continued)
- 100/115: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/15
- 101/115: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/15
- 105/115: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/15
- 107/115: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/15
- 109/115: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/15
- 110/115: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/15
- 115/115: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/15
- 66/115: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/15
- 68/115: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/15
- 76/115: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/15
- 82/115: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 89/115: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/15
- 90/115: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/15
- 91/115: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/15
- 93/115: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/15
- 97/115: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/15
- 104/115: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/15
- 62/115: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/15
- 94/115: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/15
- 95/115: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/15
- 96/115: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/15