diff mbox series

[bug#48028,wip-gnome,v5,2/8] gnu: gtkmm@2: Override inheritance of certain changes from gtkmm.

Message ID 20210427092334.23537-2-rg@raghavgururajan.name
State Accepted
Headers show
Series [bug#48028,wip-gnome,v5,1/8] gnu: gtkmm: Change build-system and adjust arguments accordingly. | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Raghav Gururajan April 27, 2021, 9:23 a.m. UTC
Recent changes made to gtkmm (d7974adbed019160c10036b040e8d9ff789cbc26),
are not applicable to gtkmm@2, as the latter does not use meson.

* gnu/packages/gtk.scm (gtkmm-2)[build-system]: New field.
[arguments]: New field.
---
 gnu/packages/gtk.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Maxime Devos April 27, 2021, 5:42 p.m. UTC | #1
Raghav Gururajan via Guix-patches via schreef op di 27-04-2021 om 05:23 [-0400]:
> Recent changes made to gtkmm (d7974adbed019160c10036b040e8d9ff789cbc26),
> are not applicable to gtkmm@2, as the latter does not use meson.
> 
> * gnu/packages/gtk.scm (gtkmm-2)[build-system]: New field.
> [arguments]: New field.

This new patch addresses my remark about inheritance.

Thanks,
Maxime.
diff mbox series

Patch

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3aa8967ca5..91bdfde092 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1673,6 +1673,16 @@  tutorial.")
                        name "-" version ".tar.xz"))
        (sha256
         (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006"))))
+    (build-system gnu-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments gtkmm)
+       ((#:modules modules %gnu-build-system-modules)
+        `((srfi srfi-1)
+          ,@modules))
+       ((#:configure-flags flags)
+        `(fold delete
+               ,flags
+               '("-Dbuild-documentation=true")))))
     (propagated-inputs
      `(("atkmm" ,atkmm-2.28)
        ("cairomm" ,cairomm-1.13)