01/01: gnu: libgnome: Leave only one 'propagated-inputs' field.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit a640d3d51b5f116cea06f47d93b05b9281f81bc7
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jul 16 17:17:12 2015 +0200

    gnu: libgnome: Leave only one 'propagated-inputs' field.
    
    * gnu/packages/gnome.scm (libgnome): Merge the two 'propagated-inputs'
      fields (followup to 25338e9.)
---
 gnu/packages/gnome.scm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2cb44f9..723cff0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1086,7 +1086,6 @@ to access local and remote files with a single consistent 
API.")
           (substitute* "libgnome/Makefile.in"
             (("-DG_DISABLE_DEPRECATED") 
"-DGLIB_DISABLE_DEPRECATION_WARNINGS")))
         %standard-phases)))
-    (propagated-inputs `(("popt" ,popt)))  ; gnome-program.h includes popt.h
     (inputs `(("libxml2" ,libxml2)))
     (native-inputs
      `(("glib" ,glib "bin")             ; for glib-mkenums, etc.
@@ -1100,7 +1099,8 @@ to access local and remote files with a single consistent 
API.")
      `(("libcanberra" ,libcanberra)
        ("libbonobo" ,libbonobo)
        ("gconf" ,gconf)
-       ("gnome-vfs" ,gnome-vfs)))
+       ("gnome-vfs" ,gnome-vfs)
+       ("popt" ,popt)))                       ;gnome-program.h includes popt.h
     (home-page "https://developer.gnome.org/libgnome/";)
     (synopsis "Useful routines for building applications")
     (description  "The libgnome library provides a number of useful routines