[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/203: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/203: build: qt-utils: Don't wrap .X-real files. |
Date: |
Wed, 3 Nov 2021 21:10:06 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 9002011c3546e14bc21acb152462d066c185924e
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")
- 61/203: gnu: gst-plugins-base: Update to 1.18.5., (continued)
- 61/203: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/11/03
- 64/203: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/11/03
- 68/203: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/11/03
- 73/203: bluez: Update to 5.61., guix-commits, 2021/11/03
- 75/203: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/11/03
- 80/203: gnu: diffutils: Update to 3.8., guix-commits, 2021/11/03
- 76/203: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/11/03
- 84/203: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/11/03
- 86/203: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/11/03
- 87/203: gnu: gdb: Normalize indentation., guix-commits, 2021/11/03
- 81/203: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 91/203: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/11/03
- 103/203: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/11/03
- 111/203: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/11/03
- 97/203: gnu: Add python-flit-core., guix-commits, 2021/11/03
- 110/203: gnu: Add docbook-xsl-ns., guix-commits, 2021/11/03
- 105/203: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/11/03
- 113/203: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/03
- 109/203: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/11/03
- 98/203: gnu: Add python-tomli., guix-commits, 2021/11/03
- 106/203: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/11/03