[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/227: build: qt-utils: Don't wrap .X-real files.
From: |
guix-commits |
Subject: |
81/227: build: qt-utils: Don't wrap .X-real files. |
Date: |
Thu, 11 Nov 2021 12:30:09 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 3dfe45c3f10e31a016b22127eede8099ca4f4b8f
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")
- 63/227: gnu: gst-plugins-bad: Update to 1.18.5., (continued)
- 63/227: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/11/11
- 64/227: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/11/11
- 65/227: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/11/11
- 67/227: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/11/11
- 68/227: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/11/11
- 74/227: gnu: python-keras: Skip a flaky test., guix-commits, 2021/11/11
- 76/227: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/11/11
- 77/227: gnu: tzdata: Update to 2021e., guix-commits, 2021/11/11
- 79/227: gnu: diffutils: Fix signal processing., guix-commits, 2021/11/11
- 78/227: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/11/11
- 81/227: build: qt-utils: Don't wrap .X-real files.,
guix-commits <=
- 82/227: gnu: curl: Honor #:tests?., guix-commits, 2021/11/11
- 83/227: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/11/11
- 86/227: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/11/11
- 87/227: gnu: gdb: Normalize indentation., guix-commits, 2021/11/11
- 88/227: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/11
- 90/227: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/11/11
- 91/227: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/11/11
- 92/227: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/11/11
- 94/227: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/11/11
- 95/227: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/11/11