Re: [PATCH 2/4] gnu: Rename 'glib' label to 'glib:bin' where appropriate.

[David Craven]

So I resubmitted the check-native-inputs patch and dropped the other
three based on the discussions.

Re: [PATCH 2/4] gnu: Rename 'glib' label to 'glib:bin' where appropriate.

[David Craven]

The reason I renamed them was to be able to check for :bin in the
label. I already dropped this patch from my fork, since we decided to
take a different approach.

I'll update the other patch, still working on it... (Need to read up
on how pattern matching works in scheme etc.)

Re: [PATCH 2/4] gnu: Rename 'glib' label to 'glib:bin' where appropriate.

[Ludovic Courtès]

David Craven  skribis:

>  (native-inputs
>   `(("intltool" ,intltool)
> -   ("glib" ,glib "bin")
> +   ("glib:bin" ,glib "bin")
> ("pkg-config" ,pkg-config)))

This patch triggers a lot of rebuild.  While I agree that consistency is
good, and that we should rather use the “glib:bin” going forward, I’d
rather avoid the extra rebuild now.

Thoughts?

Thanks,
Ludo’.

[PATCH 2/4] gnu: Rename 'glib' label to 'glib:bin' where appropriate.

[David Craven]

* gnu/packages/avahi.scm
* gnu/packages/cups.scm
* gnu/packages/geeqie.scm
* gnu/packages/gimp.scm
* gnu/packages/glib.scm
* gnu/packages/gnome.scm
* gnu/packages/gnucash.scm
* gnu/packages/gstreamer.scm
* gnu/packages/gtk.scm
* gnu/packages/ibus.scm
* gnu/packages/mail.scm
* gnu/packages/pdf.scm
* gnu/packages/qemu.scm
* gnu/packages/statistics.scm
* gnu/packages/terminals.scm
* gnu/packages/wv.scm
---
 gnu/packages/avahi.scm  |  2 +-
 gnu/packages/cups.scm   |  2 +-
 gnu/packages/geeqie.scm |  2 +-
 gnu/packages/gimp.scm   |  2 +-
 gnu/packages/glib.scm   |  8 +++---
 gnu/packages/gnome.scm  | 60 ++---
 gnu/packages/gnucash.scm|  2 +-
 gnu/packages/gstreamer.scm  |  4 +--
 gnu/packages/gtk.scm| 16 ++--
 gnu/packages/ibus.scm   |  4 +--
 gnu/packages/mail.scm   |  2 +-
 gnu/packages/pdf.scm|  2 +-
 gnu/packages/qemu.scm   |  2 +-
 gnu/packages/statistics.scm |  2 +-
 gnu/packages/terminals.scm  |  2 +-
 gnu/packages/wv.scm |  2 +-
 16 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 5740ab2..9de1f14 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -62,7 +62,7 @@
("libdaemon" ,libdaemon)))
 (native-inputs
  `(("intltool" ,intltool)
-   ("glib" ,glib "bin")
+   ("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
 (synopsis "Implementation of mDNS/DNS-SD protocols")
 (description
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 8437170..fe51516 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -77,7 +77,7 @@
  ,(string-append "--with-rcdir="
  (assoc-ref %outputs "out") "/etc/rc.d"
 (native-inputs
- `(("glib" ,glib "bin") ; for gdbus-codegen
+ `(("glib:bin" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config)))
 (inputs
  `(("fontconfig"   ,fontconfig)
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 110fb68..8fdb0f9 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -91,7 +91,7 @@ and XMP metadata of images in various formats.")
 (native-inputs
  `(("autoconf" ,autoconf)
("automake" ,automake)
-   ("glib" ,glib "bin") ; glib-gettextize
+   ("glib:bin" ,glib "bin") ; glib-gettextize
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
 (home-page "http://www.geeqie.org/;)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index d5c58e2..cb6ae01 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -110,7 +110,7 @@ provided as well as the framework to add new color models 
and data types.")
("libjpeg" ,libjpeg-8)))
 (native-inputs
  `(("pkg-config" ,pkg-config)
-   ("glib" ,glib "bin") ; for gtester
+   ("glib:bin" ,glib "bin") ; for gtester
("intltool" ,intltool)))
 (home-page "http://gegl.org;)
 (synopsis "Graph based image processing framework")
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a85a565..9729a8f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -299,7 +299,7 @@ dynamic loading, and an object system.")
("glib" ,glib)
("python-2" ,python-2)))
 (native-inputs
- `(("glib" ,glib "bin")
+ `(("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
 (propagated-inputs
  `(;; In practice, GIR users will need libffi when using
@@ -440,7 +440,7 @@ translated.")
 (inputs
  `(("expat" ,expat)))
 (native-inputs
- `(("glib" ,glib "bin")
+ `(("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
 (home-page "http://dbus.freedesktop.org/doc/dbus-glib/;)
 (synopsis "D-Bus GLib bindings")
@@ -507,7 +507,7 @@ has an ease of use unmatched by other C++ callback 
libraries.")
   "return 77;\n")))
  %standard-phases)))
 (native-inputs `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin")))
+ ("glib:bin" ,glib "bin")))
 (propagated-inputs
  `(("libsigc++" ,libsigc++)
("glib" ,glib)))
@@ -639,7 +639,7 @@ useful for C++.")
 (arguments
  '(#:configure-flags '("--enable-vala-bindings")))
 (native-inputs
- `(("glib" ,glib "bin") ; uses glib-mkenums
+ `(("glib:bin" ,glib "bin") ; uses glib-mkenums
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("python" ,python-2)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9335005..2dca93d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -142,7 +142,7 @@
  `(("hicolor-icon-theme" ,hicolor-icon-theme)))
 (native-inputs
  `(("intltool" ,intltool)
-   ("glib" ,glib "bin")   ; glib-compile-schemas, etc.
+   ("glib:bin" ,glib "bin")