diff options
| author | Brendan Tildesley <mail@brendan.scot> | 2020-09-13 15:45:55 +1000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-22 14:04:27 +0200 |
| commit | ed42b2caba0e69b056c2d2cc35ba7ca8c0e5cb10 (patch) | |
| tree | fb6cb678582d0b7b4d56d8c52f15f3a3a08cc2f2 | |
| parent | b2b799e2d8330af934f48bf66afb5114addb4dd7 (diff) | |
| download | guix-ed42b2caba0e69b056c2d2cc35ba7ca8c0e5cb10.tar.gz guix-ed42b2caba0e69b056c2d2cc35ba7ca8c0e5cb10.zip | |
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>
| -rw-r--r-- | guix/build/glib-or-gtk-build-system.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index ba680fd1a9..ccb3138fe2 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -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 |