GNU bug report logs - #56850
[PATCH staging] gnu: gtk+@2: Fix build.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH staging] gnu: gtk+@2: Fix build.
Date: Sat, 30 Jul 2022 08:32:26 +0200

* gnu/packages/gtk.scm (gtk+-2)[arguments]<#:imported-modules, #:modules>
<#:disallowed-references, #:parallel-tests?>: Copy from gtk+-3.
<#:phases>: Add ‘generate-gdk-pixbuf-loaders-cache-file’ from
glib-or-gtk-build-system.
---
 gnu/packages/gtk.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index cc25fac2aa..c6fd5fd9cb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -957,7 +957,13 @@ (define-public gtk+-2
            python-wrapper
            xorg-server-for-tests))
     (arguments
-     `(#:parallel-tests? #f
+     `(#:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%gnu-build-system-modules)
+       #:modules ((guix build utils)
+                  (guix build gnu-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
+       #:disallowed-references (,xorg-server-for-tests)
+       #:parallel-tests? #f
        #:configure-flags
        (list "--with-xinput=yes"
              (string-append "--with-html-dir="
@@ -965,6 +971,9 @@ (define-public gtk+-2
                             "/share/gtk-doc/html"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+           (assoc-ref glib-or-gtk:%standard-phases
+                      'generate-gdk-pixbuf-loaders-cache-file))
          (add-after 'unpack 'disable-failing-tests
            (lambda _
              (substitute* "gtk/Makefile.in"
-- 
2.37.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.