aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-15 21:47:00 +0200
committerMarius Bakke <marius@gnu.org>2021-05-22 17:08:13 +0200
commitc52eddc70fac9c24d557f54bc190e14ce1b1ba1d (patch)
tree700aa814dfe1e64e57f01fae9ff9e2120dd1235c
parent0d2e7dee175fcc8bdf7b1800d1075d6208237d42 (diff)
downloadguix-c52eddc70fac9c24d557f54bc190e14ce1b1ba1d.tar
guix-c52eddc70fac9c24d557f54bc190e14ce1b1ba1d.tar.gz
gnu: gtkmm: Fix build failure.
* gnu/packages/gtk.scm (gtkmm)[native-inputs]: Add GLIB:BIN. [propagated-inputs]: Change ATKMM to ATKMM-2.28 and PANGOMM to PANGOMM-2.46. * gnu/packages/gtk.scm (gtkmm-2)[native-inputs]: Don't inherit from GTKMM.
-rw-r--r--gnu/packages/gtk.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6ad9605e08..deb3ee537c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1613,6 +1613,7 @@ library.")
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
+ ("glib:bin" ,glib "bin")
("m4" ,m4)
("mm-common" ,mm-common)
("perl" ,perl)
@@ -1620,11 +1621,11 @@ library.")
("xsltproc" ,libxslt)
("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
- `(("atkmm" ,atkmm)
+ `(("atkmm" ,atkmm-2.28)
("cairomm" ,cairomm-1.14)
("glibmm" ,glibmm)
("gtk+" ,gtk+)
- ("pangomm" ,pangomm)))
+ ("pangomm" ,pangomm-2.46)))
(synopsis "C++ Interfaces for GTK+ and GNOME")
(description "GTKmm is the official C++ interface for the popular GUI
library GTK+. Highlights include typesafe callbacks, and a comprehensive set of
@@ -1664,6 +1665,15 @@ tutorial.")
`(fold delete
,flags
'("-Dbuild-documentation=true")))))
+ (native-inputs
+ `(("dot" ,graphviz)
+ ("doxygen" ,doxygen)
+ ("m4" ,m4)
+ ("mm-common" ,mm-common)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("xsltproc" ,libxslt)
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
`(("atkmm" ,atkmm-2.28)
("cairomm" ,cairomm-1.14)