Hi,
Thanks to Ludo's work on Guix lint online. I have made a patch but I
don't know if this is safe to push it on master so I prefer requesting
advices before.
TIA,
--
Mathieu Lirzin
>From 6a8f2286e307d5b77af3a546d5113c44bac13804 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <m...@gnu.org>
Date: Mon, 23 Nov 2015 10:44:53 +0100
Subject: [PATCH] gnu: Move pkg-config to native inputs.
* gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Move
pkg-config from inputs.
* gnu/packages/pulseaudio.scm (libsndfile, libsamplerate)
(pulseaudio)[native-inputs]: Likewise.
* gnu/packages/xiph.scm (ao)[native-inputs]: Likewise.
* gnu/packages/xorg.scm (xf86-video-geode)[native-inputs]: Likewise.
---
gnu/packages/glib.scm | 4 ++--
gnu/packages/pulseaudio.scm | 11 +++++++----
gnu/packages/xiph.scm | 8 +++++---
gnu/packages/xorg.scm | 4 ++--
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 146d3f5..c5eea22 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -251,10 +251,10 @@ dynamic loading, and an object system.")
("cairo" ,cairo)
("flex" ,flex)
("glib" ,glib)
- ("pkg-config" ,pkg-config)
("python-2" ,python-2)))
(native-inputs
- `(("glib" ,glib "bin")))
+ `(("glib" ,glib "bin")
+ ("pkg-config" ,pkg-config)))
(propagated-inputs
`(;; In practice, GIR users will need libffi when using
;; gobject-introspection.
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index d5e8aba..fe976a9 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -58,8 +58,9 @@
(inputs
`(("libvorbis" ,libvorbis)
("libogg" ,libogg)
- ("flac" ,flac)
- ("pkg-config" ,pkg-config)))
+ ("flac" ,flac)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.mega-nerd.com/libsndfile/";)
(synopsis "Reading and writing files containing sampled sound")
(description
@@ -87,7 +88,8 @@ for reading and writing new sound file formats.")
(base32
"01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("libsndfile" ,libsndfile)
("fftw" ,fftw)))
@@ -162,13 +164,14 @@ rates.")
("dbus" ,dbus)
("glib" ,glib)
("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
("m4" ,m4)
("libltdl" ,libltdl)
("fftwf" ,fftwf)
("avahi" ,avahi)
("eudev" ,eudev) ;for the detection of hardware audio devices
("check" ,check)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(propagated-inputs
;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them.
`(("libcap" ,libcap)
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 705ebe1..930fbfd 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -165,9 +165,11 @@ stereo encoding, and voice activity detection.")
;; XXX: Should back-ends be pushed to different outputs? For instance,
;; "out" would include only the ALSA back-end, while "pulse" would
;; contain 'lib/ao/plugins-4/libpulse.*'.
- (inputs `(("pkg-config" ,pkg-config)
- ("alsa-lib" ,alsa-lib)
- ("pulseaudio" ,pulseaudio)))
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("pulseaudio" ,pulseaudio)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(synopsis "Cross platform audio library")
(description
"Libao is a cross-platform audio library that allows programs to
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 54c15dd..42422a3 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2710,8 +2710,8 @@ framebuffer device.")
"19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q"))
(patches (list (search-patch "xf86-video-geode-glibc-2.20.patch")))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xorg-server" ,xorg-server)))
+ (inputs `(("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(supported-systems
;; This driver is only supported on i686 systems.
(filter (lambda (system) (string-prefix? "i686-" system))
--
2.6.3
