ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-09 12:49:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: qt-utils: Don't wrap .X-real files.

Browse source 
* guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped
programs.  This is forbidden in wrap-program now due to a738a663a9.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Brendan Tildesley 2021-10-05 22:01:06 +11:00 committed by Maxim Cournoyer
parent 57fd6d511c
commit 3dfe45c3f1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/build/qt-utils.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -133,7 +134,10 @@ (define* (wrap-all-qt-programs #:key inputs outputs
(define (find-files-to-wrap output-dir) (define (find-files-to-wrap output-dir)
(append-map (append-map
(lambda (dir) (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") (list (string-append output-dir "/bin")
(string-append output-dir "/sbin") (string-append output-dir "/sbin")
(string-append output-dir "/libexec") (string-append output-dir "/libexec")