[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/136: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/136: build: qt-utils: Don't wrap .X-real files. |
Date: |
Sun, 17 Oct 2021 05:16:09 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit a0c5b8fa9ad65e81ebfc4d365a7dd189b3039e5a
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")
- 66/136: gnu: gst-editing-services: Update to 1.18.5., (continued)
- 66/136: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 80/136: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/17
- 83/136: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/17
- 97/136: gnu: Add python-flit-core., guix-commits, 2021/10/17
- 113/136: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 107/136: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 65/136: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/17
- 76/136: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/17
- 72/136: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/17
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 81/136: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 85/136: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 88/136: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 108/136: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/17
- 117/136: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 106/136: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 102/136: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/17
- 119/136: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17