diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2015-12-06 17:12:14 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2015-12-06 17:25:13 +0100 |
| commit | d7e92b8752f6bc9e2c61c9999834392c7fe67e7e (patch) | |
| tree | 899dc392b55bc95dc6698a051afcaff051a9ce28 /gnu | |
| parent | e414a7dec365233ad505595bbebaff5d30e72f19 (diff) | |
| download | guix-d7e92b8752f6bc9e2c61c9999834392c7fe67e7e.tar guix-d7e92b8752f6bc9e2c61c9999834392c7fe67e7e.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/glib.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2e8797560b..46a568631a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -227,10 +227,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 d832228278..93055ecad3 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -55,8 +55,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 @@ -84,7 +85,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))) @@ -159,13 +161,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) |