diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
| commit | 3820d3973982048e5b93ad08d619c893bc50de14 (patch) | |
| tree | 159a3ea785647fb8bb5e4b754f5c0f98d86e29d5 /gnu/packages/gtk.scm | |
| parent | 751be9a056114d353bac12510bea33e8d5577f49 (diff) | |
| parent | afff9058a0a9a3f3d633f563bb8a1a7d9e503165 (diff) | |
| download | guix-3820d3973982048e5b93ad08d619c893bc50de14.tar.gz guix-3820d3973982048e5b93ad08d619c893bc50de14.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/gnupg.scm
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 424b6e0f87..e33bcd5a27 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -533,7 +533,7 @@ graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.") (license license:lgpl3+))) - + ;;; ;;; C++ bindings. ;;; @@ -706,9 +706,9 @@ extensive documentation, including API reference and a tutorial.") "Pycairo is a set of Python bindings for the Cairo graphics library.") (license license:lgpl3+))) -(define-public python2-py2cairo +(define-public python2-pycairo (package (inherit python-pycairo) - (name "python2-py2cairo") + (name "python2-pycairo") (version "1.10.0") (source (origin @@ -744,7 +744,7 @@ extensive documentation, including API reference and a tutorial.") `(("python" ,python-2) ("glib" ,glib))) (propagated-inputs - `(("python-pycairo" ,python2-py2cairo) ;loaded at runtime + `(("python-pycairo" ,python2-pycairo) ;loaded at runtime ("python-pygobject" ,python2-pygobject-2) ;referenced in pc file ("gtk+" ,gtk+-2))) (arguments |