unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 56850@debbugs.gnu.org
Subject: [bug#56850] [PATCH staging] gnu: gtk+@2: Fix build.
Date: Sat, 30 Jul 2022 08:32:26 +0200	[thread overview]
Message-ID: <e0546ab120a567cf7148c5ffcda247ce3c68c7cc.camel@gmail.com> (raw)

* 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





                 reply	other threads:[~2022-07-31 10:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e0546ab120a567cf7148c5ffcda247ce3c68c7cc.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=56850@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).