gnu: gconf: Propagate input glib.

* gnu/packages/gnome.scm (gconf): Propagate input glib.
  (gnome-vfs): Drop input glib.
  (libgnome): Drop propagated input glib.
* gnu/packages/ibus.scm (ibus): Drop input glib.
This commit is contained in:
Andreas Enge 2015-05-20 23:46:17 +02:00
parent 7f18257bea
commit 2e6ecc5c21
2 changed files with 35 additions and 37 deletions

View File

@ -823,11 +823,11 @@ use in GNOME applications, built on top of CORBA.")
(sha256 (sha256
(base32 "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr")))) (base32 "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("glib" ,glib) (inputs `(("dbus" ,dbus)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(propagated-inputs `(("orbit2" ,orbit2))) ; referred to in the .pc file (propagated-inputs `(("glib" ,glib) ; referred to in the .pc file
("orbit2" ,orbit2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin") ; for glib-genmarshal, etc. ("glib" ,glib "bin") ; for glib-genmarshal, etc.
@ -891,8 +891,7 @@ designed to be accessed through the MIME functions in GnomeVFS.")
(substitute* "test/test-async-cancel.c" (substitute* "test/test-async-cancel.c"
(("EXIT_FAILURE") "77"))) (("EXIT_FAILURE") "77")))
%standard-phases)))) %standard-phases))))
(inputs `(("glib" ,glib) (inputs `(("libxml2" ,libxml2)
("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("dbus" ,dbus) ("dbus" ,dbus)
("gconf" ,gconf) ("gconf" ,gconf)
@ -947,8 +946,7 @@ to access local and remote files with a single consistent API.")
`(("libcanberra" ,libcanberra) `(("libcanberra" ,libcanberra)
("libbonobo" ,libbonobo) ("libbonobo" ,libbonobo)
("gconf" ,gconf) ("gconf" ,gconf)
("gnome-vfs" ,gnome-vfs) ("gnome-vfs" ,gnome-vfs)))
("glib" ,glib)))
(home-page "https://developer.gnome.org/libgnome/") (home-page "https://developer.gnome.org/libgnome/")
(synopsis "Useful routines for building applications") (synopsis "Useful routines for building applications")
(description "The libgnome library provides a number of useful routines (description "The libgnome library provides a number of useful routines

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -72,7 +73,6 @@
`(("dbus" ,dbus) `(("dbus" ,dbus)
("dconf" ,dconf) ("dconf" ,dconf)
("gconf" ,gconf) ("gconf" ,gconf)
("glib" ,glib)
("gtk2" ,gtk+-2) ("gtk2" ,gtk+-2)
("intltool" ,intltool) ("intltool" ,intltool)
("libnotify" ,libnotify) ("libnotify" ,libnotify)