me
/
guix
Archived
1
0
Fork 0
Code

gnu: Move pkg-config to 'native-inputs' in various places. 

* gnu/packages/glib.scm (libsigc++): Move pkg-config to
  'native-inputs'.
  (glibmm): Likewise.
* gnu/packages/mpd.scm (mpd): Likewise.
* gnu/packages/package-management.scm (guix-0.7): Likewise.
* gnu/packages/sdl.scm (sdl-net): Likewise.
  (sdl-ttf): Likewise.
* gnu/packages/xiph.scm (vorbis-tools): Likewise.
master
Ludovic Courtès 2014-11-07 13:49:37 +01:00
parent 9a130e19fc
commit 41eb11988e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/glib.scm
View File

@ -354,8 +354,8 @@ by GDBus included in Glib.")
(base32 (base32
"14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37")))) "14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)
(native-inputs `(("m4" ,m4))) ("m4" ,m4)))
(home-page "http://libsigc.sourceforge.net/") (home-page "http://libsigc.sourceforge.net/")
(synopsis "Type-safe callback system for standard C++") (synopsis "Type-safe callback system for standard C++")
(description (description
@ -397,8 +397,8 @@ has an ease of use unmatched by other C++ callback libraries.")
(("Gio::init.*$") (("Gio::init.*$")
"return 77;\n"))) "return 77;\n")))
%standard-phases))) %standard-phases)))
(inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ("glib" ,glib "bin")))
(propagated-inputs (propagated-inputs
`(("libsigc++" ,libsigc++) `(("libsigc++" ,libsigc++)
("glib" ,glib))) ("glib" ,glib)))

2
gnu/packages/mpd.scm
View File

@ -94,10 +94,10 @@ interfacing MPD in the C, C++ & Objective C languages.")
("libsndfile" ,libsndfile) ("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("opus" ,opus) ("opus" ,opus)
("pkg-config" ,pkg-config)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs `(("pkg-config" ,pkg-config)))
;; Missing optional inputs: ;; Missing optional inputs:
;; libyajl ;; libyajl
;; libcdio_paranoia ;; libcdio_paranoia

2
gnu/packages/package-management.scm
View File

@ -75,6 +75,7 @@
(copy "mips64el") (copy "mips64el")
#t) #t)
%standard-phases))) %standard-phases)))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs (inputs
(let ((boot-guile (lambda (arch hash) (let ((boot-guile (lambda (arch hash)
(origin (origin
@ -90,7 +91,6 @@
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("guile" ,guile-2.0) ("guile" ,guile-2.0)
("pkg-config" ,pkg-config)
("boot-guile/i686" ("boot-guile/i686"
,(boot-guile "i686" ,(boot-guile "i686"

6
gnu/packages/sdl.scm
View File

@ -212,7 +212,7 @@ MIDI, Ogg Vorbis, and MP3.")
"1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz")))) "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs `(("sdl" ,sdl))) (propagated-inputs `(("sdl" ,sdl)))
(inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "SDL networking library") (synopsis "SDL networking library")
(description "SDL_net is a small, cross-platform networking library for (description "SDL_net is a small, cross-platform networking library for
SDL.") SDL.")
@ -234,8 +234,8 @@ SDL.")
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs `(("sdl" ,sdl))) (propagated-inputs `(("sdl" ,sdl)))
(inputs `(("freetype" ,font:freetype) (inputs `(("freetype" ,font:freetype)
("mesa" ,mesa) ("mesa" ,mesa)))
("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "SDL TrueType font library") (synopsis "SDL TrueType font library")
(description "SDL_ttf is a TrueType font rendering library for SDL.") (description "SDL_ttf is a TrueType font rendering library for SDL.")
(home-page "http://www.libsdl.org/projects/SDL_ttf/") (home-page "http://www.libsdl.org/projects/SDL_ttf/")

2
gnu/packages/xiph.scm
View File

@ -271,8 +271,8 @@ Kate stream.")
("libkate" ,libkate) ("libkate" ,libkate)
("libogg" ,libogg) ("libogg" ,libogg)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("pkg-config" ,pkg-config)
("speex" ,speex))) ("speex" ,speex)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "Ogg vorbis tools") (synopsis "Ogg vorbis tools")
(description (description
"Ogg vorbis is a non-proprietary, patent-and-royalty-free, "Ogg vorbis is a non-proprietary, patent-and-royalty-free,