me
/
guix
Archived
1
0
Fork 0
Code

glib-or-gtk-build-system: Don't double wrap programs. 

* guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): If a
package definition was modified to insert an additional wrap phase
before glib-or-gtk...'s wrap phase instead of after, glib-or-gtk...'s
wrap phase will double wrap the .X-real file from the earlier wrap
phase. Filtering out such wrapped programs means these .X-real files
should fix this and mean packagers don't have to worry about ensuring
their wrap phases are put afterwards.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Brendan Tildesley 2020-09-13 15:45:55 +10:00 committed by Ludovic Courtès
parent b2b799e2d8
commit ed42b2caba
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/build/glib-or-gtk-build-system.scm
View File

@ -142,8 +142,9 @@ add a dependency of that output on GLib and GTK+."
(unless (member output glib-or-gtk-wrap-excluded-outputs)
(let* ((bindir (string-append directory "/bin"))
(libexecdir (string-append directory "/libexec"))
(bin-list (append (find-files bindir ".*")
(find-files libexecdir ".*")))
(bin-list (filter (negate wrapped-program?)
(append (find-files bindir ".*")
(find-files libexecdir ".*"))))
(datadirs (data-directories
(alist-cons output directory inputs)))
(gtk-mod-dirs (gtk-module-directories