diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-07-13 23:44:55 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-13 23:44:55 +0200 |
| commit | c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b (patch) | |
| tree | 1d04f8c542b78e1510a8d29163e578fe2538d81e /gnu/packages/glib.scm | |
| parent | 314a83ef1e80b47b44debc1118e38d7f761e0e7f (diff) | |
| parent | ca9ea1a849d685db46adcb92449dff36427c48bd (diff) | |
| download | guix-c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b.tar guix-c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b.tar.gz | |
Merge branch 'bug-17853'
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 77f21f95ce..239715ecc7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -106,28 +106,29 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.39.1") + (version "2.40.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0lqi6z47068vgh91fm59jn0kq969wf3g2q8k4m33jsb0amprg36h")) + (base32 "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd")) (patches (list (search-patch "glib-tests-homedir.patch") (search-patch "glib-tests-desktop.patch") (search-patch "glib-tests-prlimit.patch") - (search-patch "glib-tests-newnet.patch"))))) + (search-patch "glib-tests-timer.patch"))))) (build-system gnu-build-system) - (outputs '("out" ; everything - "doc")) ; 20 MiB of GTK-Doc reference + (outputs '("out" ; everything + "bin" ; glib-mkenums, gtester, etc.; depends on Python + "doc")) ; 20 MiB of GTK-Doc reference (inputs `(("coreutils" ,coreutils) ("libffi" ,libffi) ("zlib" ,zlib) ("tzdata" ,tzdata))) ; for tests/gdatetime.c (native-inputs - `(("gettext" ,gnu-gettext) + `(("gettext" ,gnu-gettext) ("dbus" ,dbus) ; for GDBus tests ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -201,6 +202,8 @@ dynamic loading, and an object system.") ("glib" ,glib) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) + (native-inputs + `(("glib" ,glib "bin"))) (propagated-inputs `(;; In practice, GIR users will need libffi when using ;; gobject-introspection. @@ -318,7 +321,9 @@ translated.") (inputs `(("dbus" ,dbus) ("expat" ,expat) - ("glib" ,glib) + ("glib" ,glib))) + (native-inputs + `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://dbus.freedesktop.org/doc/dbus-glib/") (synopsis "D-Bus GLib bindings") @@ -382,7 +387,8 @@ has an ease of use unmatched by other C++ callback libraries.") (("Gio::init.*$") "return 77;\n"))) %standard-phases))) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("glib" ,glib "bin"))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) |