diff options
| author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
| commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
| tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /gnu/packages/glib.scm | |
| parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
| parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) | |
| download | guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0f06f7717c..16a1a6162d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -524,9 +524,11 @@ useful for C++.") ("pkg-config" ,pkg-config))) (inputs `(("python" ,python) - ("glib" ,glib) ("python-pycairo" ,python-pycairo) - ("gobject-introspection" ,gobject-introspection) + ("gobject-introspection" ,gobject-introspection))) + (propagated-inputs + ;; pygobject-3.0.pc refers to all these. + `(("glib" ,glib) ("libffi" ,libffi))) (arguments ;; TODO: failing tests: test_native_calls_async @@ -538,6 +540,8 @@ useful for C++.") ;; test_callback_user_data_middle_single ;; test_callback_user_data_middle_tuple '(#:tests? #f)) + ;; For finding typelib files, since gobject-introscpetion isn't propagated. + (native-search-paths (package-native-search-paths gobject-introspection)) (home-page "https://live.gnome.org/PyGObject") (synopsis "Python bindings for GObject") (description @@ -550,10 +554,8 @@ useful for C++.") (name "python2-pygobject") (inputs `(("python" ,python-2) - ("glib" ,glib) ("python-pycairo" ,python2-pycairo) - ("gobject-introspection" ,gobject-introspection) - ("libffi" ,libffi))))) + ("gobject-introspection" ,gobject-introspection))))) (define telepathy-glib (package |