nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Move numerous "inputs" which should be "native-inputs". 

* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
  gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
  gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
  gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
  gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
  gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
  gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
  gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
  gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
  gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
  gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
  gnu/packages/texlive.scm, gnu/packages/version-control.scm,
  gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
  gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
  gnu/packages/zip.scm:  Move some build-time dependencies from `inputs' to
  `native-inputs'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
John Darrington 2013-12-15 12:01:56 +01:00 committed by Ludovic Courtès
parent e766f699be
commit c4c4cc0597
45 changed files with 619 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/algebra.scm
View File

@ -168,8 +168,8 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
(base32
"0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"))))
(build-system gnu-build-system)
(inputs `(("readline" ,readline)
("flex" ,flex)))
(inputs `(("readline" ,readline)))
(native-inputs `(("flex" ,flex)))
(arguments
'(#:phases
(alist-replace 'configure

9
gnu/packages/avahi.scm
View File

@ -56,10 +56,11 @@
`(("expat" ,expat)
("glib" ,glib)
("dbus" ,dbus)
("libdaemon" ,libdaemon)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("gdbm" ,gdbm)))
("gdbm" ,gdbm)
("libdaemon" ,libdaemon)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(synopsis "Avahi, an mDNS/DNS-SD implementation")
(description
"Avahi is a system which facilitates service discovery on a local

10
gnu/packages/cdrom.scm
View File

@ -78,10 +78,11 @@ caching facility provided by the library.")
"0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)
("libcddb" ,libcddb)))
(native-inputs
`(("help2man" ,help2man)
("ncurses" ,ncurses)
("pkg-config" ,pkg-config)
("libcddb" ,libcddb)))
("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/libcdio/")
(synopsis "CD Input and Control library")
(description
@ -182,8 +183,9 @@ reconstruction capability.")
"0pm039a78h7m9vvjmmjfkl05ii6qdmfhvbypxjbc7j5w82y66is4"))))
(build-system gnu-build-system)
(inputs
`(("gtk+" ,gtk+-2)))
(native-inputs
`(("gettext" ,gnu-gettext)
("gtk+" ,gtk+-2)
("pkg-config" ,pkg-config)
("which" ,which)))
(arguments

7
gnu/packages/cryptsetup.scm
View File

@ -44,9 +44,10 @@
(inputs
`(("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2)
("popt" ,popt)
("python" ,python-wrapper)
("util-linux" ,util-linux)))
("util-linux" ,util-linux)
("popt" ,popt)))
(native-inputs
`(("python" ,python-wrapper)))
(synopsis "hard disk encryption tool")
(description
"LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk

9
gnu/packages/curl.scm
View File

@ -45,15 +45,16 @@
"13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx"))))
(build-system gnu-build-system)
(inputs `(("gnutls" ,gnutls)
;; to enable the --manual option and make test 1026 pass
("groff" ,groff)
("gss" ,gss)
("libidn" ,libidn)
("libssh2" ,libssh2)
("openldap" ,openldap)
("perl" ,perl)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
;; to enable the --manual option and make test 1026 pass
("groff" ,groff)
("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags '("--with-gnutls" "--with-gssapi")))
(synopsis "curl, command line tool for transferring data with URL syntax")

7
gnu/packages/emacs.scm
View File

@ -65,9 +65,7 @@
"pwd")))
%standard-phases)))
(inputs
`(("pkg-config" ,pkg-config)
("gnutls" ,gnutls)
("texinfo" ,texinfo)
`(("gnutls" ,gnutls)
("ncurses" ,ncurses)
;; TODO: Add the optional dependencies.
@ -86,6 +84,9 @@
("libXpm" ,libxpm)
("libxml2" ,libxml2)
("dbus" ,dbus)))
(native-inputs
`(("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(home-page "http://www.gnu.org/software/emacs/")
(synopsis "The extensible, customizable, self-documenting text editor")
(description

5
gnu/packages/fontutils.scm
View File

@ -76,8 +76,9 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(build-system gnu-build-system)
(inputs `(("expat" ,expat)
("freetype" ,freetype)
("gs-fonts" ,gs-fonts)
("pkg-config" ,pkg-config)))
("gs-fonts" ,gs-fonts)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
;; point to user profile instead of /usr/share/fonts in /etc/fonts.conf

3
gnu/packages/gdb.scm
View File

@ -57,8 +57,9 @@
("readline" ,readline)
("ncurses" ,ncurses)
("python" ,python-wrapper)
("texinfo" ,texinfo)
("dejagnu" ,dejagnu)))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "http://www.gnu.org/software/gdb/")
(synopsis "The GNU debugger")
(description

5
gnu/packages/geeqie.scm
View File

@ -72,11 +72,12 @@ and XMP metadata of images in various formats.")
(build-system gnu-build-system)
(inputs
`(;; ("libchamplain" ,libchamplain)
("intltool" ,intltool)
("lcms" ,lcms)
("exiv2" ,exiv2)
("libpng" ,libpng)
("gtk+" ,gtk+-2)
("gtk+" ,gtk+-2)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "http://geeqie.sourceforge.net")
(synopsis "Lightweight GTK+ based image viewer")

13
gnu/packages/ghostscript.scm
View File

@ -134,11 +134,12 @@ printing, and psresize, for adjusting page sizes.")
("libpng" ,libpng)
("libpaper" ,libpaper)
("libtiff" ,libtiff)
("perl" ,perl)
("pkg-config" ,pkg-config) ; needed to find libtiff
("python" ,python-wrapper)
("tcl" ,tcl)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config) ; needed to find libtiff
("python" ,python-wrapper)
("tcl" ,tcl)))
(arguments
`(#:phases
(alist-replace
@ -225,8 +226,8 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.")
(sha256 (base32
"1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"))))
(build-system gnu-build-system)
(inputs `(("ghostscript" ,ghostscript)
("pkg-config" ,pkg-config)))
(inputs `(("ghostscript" ,ghostscript)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "postscript rendering library")
(description
"libspectre is a small library for rendering Postscript documents.

12
gnu/packages/glib.scm
View File

@ -123,16 +123,16 @@ shared NFS home directories.")
"doc")) ; 20 MiB of GTK-Doc reference
(inputs
`(("coreutils" ,coreutils)
("gettext" ,gnu-gettext)
("libffi" ,libffi)
("zlib" ,zlib)
("tzdata" ,tzdata))) ; for tests/gdatetime.c
(native-inputs
`(("gettext" ,gnu-gettext)
("dbus" ,dbus) ; for GDBus tests
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("zlib" ,zlib)
("perl" ,perl) ; needed by GIO tests
("dbus" ,dbus) ; for GDBus tests
("bash" ,bash)
("tzdata" ,tzdata) ; for tests/gdatetime.c
))
("bash" ,bash)))
(arguments
'(#:phases (alist-cons-before
'build 'pre-build

42
gnu/packages/gnome.scm
View File

@ -55,13 +55,14 @@
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+)
("intltool" ,intltool)
("itstool" ,itstool)
("libcanberra" ,libcanberra)
("libice" ,libice)
("libnotify" ,libnotify)
("libsm" ,libsm)
("libxml2" ,libxml2)
("libxml2" ,libxml2)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "https://projects.gnome.org/brasero/")
(synopsis "CD/DVD burning tool for Gnome")
@ -83,7 +84,7 @@ features to enable users to create their discs easily and quickly.")
(base32
"19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
(build-system gnu-build-system)
(inputs
(native-inputs
`(("intltool" ,intltool)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
@ -114,12 +115,12 @@ and keep up to date translations of documentation.")
(base32
"0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)))
(inputs
`(("pkg-config" ,pkg-config)
("libgcrypt" ,libgcrypt)
`(("libgcrypt" ,libgcrypt)
("dbus" ,dbus)))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(propagated-inputs
;; Referred to in .h files and .pc.
`(("glib" ,glib)))
@ -177,7 +178,6 @@ and keep up to date translations of documentation.")
("gtk+" ,gtk+)
("glib" ,glib)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
("libsm" ,libsm)
("libice" ,libice)
("shared-mime-info" ,shared-mime-info)
@ -185,7 +185,8 @@ and keep up to date translations of documentation.")
;; For tests.
("dogtail" ,python2-dogtail)))
(native-inputs
`(("intltool" ,intltool)))
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page
"http://www.gnome.org/projects/evince/")
(synopsis "GNOME's document viewer")
@ -211,8 +212,9 @@ on the GNOME Desktop with a single simple application.")
"1km8qxwrzvravmg8j680qv64bwnwbdgrmy8bqmhs0dgxn2b1as6a"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)
("intltool" ,intltool)
`(("glib" ,glib)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "https://launchpad.net/gsettings-desktop-schemas")
(synopsis
@ -263,9 +265,10 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
(build-system gnu-build-system)
(inputs
`(("gtk+" ,gtk+)
("icon-naming-utils" ,icon-naming-utils)
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
("icon-naming-utils" ,icon-naming-utils)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "http://art.gnome.org/")
(synopsis
"GNOME icon theme")
@ -290,10 +293,10 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
'(#:parallel-build? #f))
(inputs
`(("glib" ,glib)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)))
("libxml2" ,libxml2)))
(native-inputs
`(("intltool" ,intltool)))
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "http://freedesktop.org/wiki/Software/shared-mime-info")
(synopsis "Database of common MIME types")
(description
@ -344,8 +347,9 @@ database is translated at Transifex.")
`(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
("gtk+" ,gtk+)
("libpng" ,libpng)
("pkg-config" ,pkg-config)))
("libpng" ,libpng)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://developer-next.gnome.org/libnotify/")
(synopsis
"GNOME desktop notification library")

3
gnu/packages/gnunet.scm
View File

@ -79,8 +79,9 @@
("libtiff" ,libtiff)
("libtool" ,libtool)
("libvorbis" ,libvorbis)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "Library to extract meta-data from media files")
(description
"GNU libextractor is a library for extracting metadata from files. It

9
gnu/packages/gnuzilla.scm
View File

@ -69,13 +69,16 @@
("libxt" ,libxt)
("libffi" ,libffi)
("mesa" ,mesa)
("perl" ,perl)
("python" ,python-2) ; Python 3 not supported
("python2-pysqlite" ,python2-pysqlite)
("unzip" ,unzip)
("yasm" ,yasm)
("zip" ,zip)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
("python" ,python-2) ; Python 3 not supported
("python2-pysqlite" ,python2-pysqlite)
("pkg-config" ,pkg-config)
("python" ,python-2))) ; Python 3 not supported
(arguments
`(#:tests? #f ; no check target

7
gnu/packages/graphviz.scm
View File

@ -71,11 +71,12 @@
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("libltdl" ,libtool)
("bison" ,bison)
("libXaw" ,libxaw)
("expat" ,expat)
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libpng" ,libpng)))
(native-inputs
`(("bison" ,bison)
("pkg-config" ,pkg-config)))
(home-page "http://www.graphviz.org/")
(synopsis "Graph visualization software")
@ -109,7 +110,7 @@ interfaces for other technical domains.")
;; Some data files used by the test suite are missing.
;; See <http://sourceforge.net/p/gts/bugs/41/>.
#:tests? #f))
(inputs
(native-inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
;; The gts.pc file has glib-2.0 as required.

6
gnu/packages/groff.scm
View File

@ -39,9 +39,9 @@
(sha256 (base32
"0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
(build-system gnu-build-system)
(inputs `(("bison" ,bison)
("ghostscript" ,ghostscript)
("netpbm" ,netpbm)
(inputs `(("ghostscript" ,ghostscript)
("netpbm" ,netpbm)))
(native-inputs `(("bison" ,bison)
("perl" ,perl)
("psutils" ,psutils)
("texinfo" ,texinfo)))

20
gnu/packages/gstreamer.scm
View File

@ -43,10 +43,10 @@
(base32
"0c0irk85jd2cihm5pmf4zxhlpg08qpxjcqv1l9qn2n3h2gsaj2lf"))))
(build-system gnu-build-system)
(inputs
(inputs `(("glib" ,glib)))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("glib" ,glib)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
@ -82,10 +82,10 @@ This package provides the core library and elements.")
(search-patch "gstreamer-0.10-silly-test.patch")))))
(propagated-inputs
`(("libxml2" ,libxml2)))
(inputs
(inputs `(("glib" ,glib)))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("glib" ,glib)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2)))))
@ -106,9 +106,10 @@ This package provides the core library and elements.")
;; FIXME: Add more dependencies for further plugins.
(inputs
`(("glib" ,glib)
("gstreamer" ,gstreamer)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
("gstreamer" ,gstreamer)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
(arguments
`(#:tests? #f))
;; All tests pass except for one:
@ -147,6 +148,7 @@ This package provides an essential exemplary set of elements.")
"0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"))))
(inputs
`(("glib" ,glib)
("gstreamer" ,gstreamer-0.10)
("pkg-config" ,pkg-config)
("gstreamer" ,gstreamer-0.10)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-2)))))

62
gnu/packages/gtk.scm
View File

@ -53,8 +53,8 @@
(base32
"1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
(build-system gnu-build-system)
(inputs `(("glib" ,glib)
("pkg-config" ,pkg-config)))
(inputs `(("glib" ,glib)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "GNOME accessibility toolkit")
(description
"ATK provides the set of accessibility interfaces that are implemented
@ -87,11 +87,12 @@ tools have full access to view and control running applications.")
(inputs
`(("ghostscript" ,ghostscript)
("libspectre" ,libspectre)
("pkg-config" ,pkg-config)
("poppler" ,poppler)
("python" ,python-wrapper)
("xextproto" ,xextproto)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(arguments
`(#:tests? #f)) ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
(synopsis "2D graphics library")
@ -127,8 +128,9 @@ affine transformation (scale, rotation, shear, etc.)")
(build-system gnu-build-system)
(inputs
`(("cairo" ,cairo)
("icu4c" ,icu4c)
("pkg-config" ,pkg-config)
("icu4c" ,icu4c)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(synopsis "opentype text shaping engine")
(description
@ -153,8 +155,9 @@ affine transformation (scale, rotation, shear, etc.)")
`(("cairo" ,cairo)
("harfbuzz" ,harfbuzz)))
(inputs
`(("pkg-config" ,pkg-config)
("zlib" ,zlib)))
`(("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "GNOME text and font handling library")
(description
"Pango is the core text and font handling library used in GNOME
@ -178,14 +181,14 @@ used throughout the world.")
"07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
(build-system gnu-build-system)
(inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)
("gtk" ,gtk+-2)
`(("gtk" ,gtk+-2)
("libxml2" ,libxml2)
;; These two are needed only to allow the tests to run successfully.
("xorg-server" ,xorg-server)
("shared-mime-info" ,shared-mime-info)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(arguments
`(#:phases
;; Unfortunately, some of the tests in "make check" are highly dependent
@ -233,8 +236,9 @@ printing and other features typical of a source code editor.")
`(("glib" ,glib)
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libtiff" ,libtiff)
("pkg-config" ,pkg-config)))
("libtiff" ,libtiff)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "GNOME image loading and manipulation library")
(description
"GdkPixbuf is a library for image loading and manipulation developed
@ -257,10 +261,11 @@ in the GNOME project.")
(build-system gnu-build-system)
(inputs `(("dbus" ,dbus)
("glib" ,glib)
("intltool" ,intltool)
("libxi" ,libxi)
("libxtst" ,libxtst)
("pkg-config" ,pkg-config)))
("libxtst" ,libxtst)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(arguments
`(#:tests? #f)) ; FIXME: dbind/dbtest fails; one should disable tests in
; a more fine-grained way.
@ -287,8 +292,9 @@ is part of the GNOME accessibility project.")
(inputs `(("atk" ,atk)
("at-spi2-core" ,at-spi2-core)
("dbus" ,dbus)
("glib" ,glib)
("pkg-config" ,pkg-config)))
("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
`(#:tests? #f)) ; FIXME: droute/droute-test fails; one should disable
; tests in a more fine-grained way.
@ -316,7 +322,7 @@ is part of the GNOME accessibility project.")
`(("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf)
("pango" ,pango)))
(inputs
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
@ -359,8 +365,9 @@ application suites.")
("libxinerama" ,libxinerama)
("pango" ,pango)))
(inputs
`(("libxml2" ,libxml2)
("perl" ,perl)
`(("libxml2" ,libxml2)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
("xorg-server" ,xorg-server)))
@ -425,8 +432,9 @@ application suites.")
`(("guile-lib" ,guile-lib)
("expat" ,expat)
("cairo" ,cairo)
("pkg-config" ,pkg-config)
("guile" ,guile-2.0)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.nongnu.org/guile-cairo/")
(synopsis "Cairo bindings for GNU Guile")
(description
@ -458,7 +466,7 @@ exceptions, macros, and a dynamic programming environment.")
(arguments
;; The examples lack -lcairo.
'(#:make-flags '("LDFLAGS=-lcairo")))
(inputs `(("pkg-config" ,pkg-config)))
(native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("libsigc++" ,libsigc++)
("freetype" ,freetype)
@ -483,7 +491,7 @@ library.")
(base32
"0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"))))
(build-system gnu-build-system)
(inputs `(("pkg-config" ,pkg-config)))
(native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("cairo" ,cairo)
("cairomm" ,cairomm)
@ -508,7 +516,7 @@ library.")
(base32
"06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"))))
(build-system gnu-build-system)
(inputs `(("pkg-config" ,pkg-config)))
(native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("glibmm" ,glibmm) ("atk" ,atk)))
(home-page "http://www.gtkmm.org")
@ -530,7 +538,7 @@ toolkit.")
(base32
"0yf8wwv4w02p70nrxsbs0nhm0w4gkn2wggdjygd8vif062anf1rs"))))
(build-system gnu-build-system)
(inputs `(("pkg-config" ,pkg-config)))
(native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("pangomm" ,pangomm)
("cairomm" ,cairomm)

3
gnu/packages/gv.scm
View File

@ -51,8 +51,9 @@
("libxaw3d" ,libxaw3d)
("libxinerama" ,libxinerama)
("libxpm" ,libxpm)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "PostScript and PDF viewer using Ghostscript as a back-end")
(description
"GNU GV is a graphical user interface to the Ghostscript interpreter.

4
gnu/packages/imagemagick.scm
View File

@ -78,8 +78,8 @@
("pango" ,pango)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
("pkg-config" ,pkg-config)))
("xz" ,xz)))
(native-inputs `(("pkg-config" ,pkg-config)))
(outputs '("out"
"doc")) ; 26 MiB of HTML documentation
(home-page "http://www.imagemagick.org/")

5
gnu/packages/irssi.scm
View File

@ -54,8 +54,9 @@
%standard-phases)))
(inputs
`(("glib" ,glib)
("pkg-config" ,pkg-config)
("ncurses" ,ncurses)
("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl)))
(home-page "http://www.irssi.org/")
(synopsis "Irssi, a terminal-based IRC client")

3
gnu/packages/kde.scm
View File

@ -68,9 +68,10 @@
`(("automoc4" ,automoc4)
("glib" ,glib)
("libx11" ,libx11)
("pkg-config" ,pkg-config)
("pulseaudio" ,pulseaudio)
("qt" ,qt-4)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
`(#:tests? #f)) ; no test target
(home-page "http://phonon.kde.org/")

5
gnu/packages/libcanberra.scm
View File

@ -47,8 +47,9 @@
("gstreamer" ,gstreamer)
("gtk+" ,gtk+)
("libtool" ,libtool)
("libvorbis" ,libvorbis)
("pkg-config" ,pkg-config)))
("libvorbis" ,libvorbis)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://0pointer.de/lennart/projects/libcanberra/")
(synopsis
"Implementation of the XDG Sound Theme and Name Specifications")

4
gnu/packages/libtiff.scm
View File

@ -37,10 +37,10 @@
(sha256 (base32
"0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"))))
(build-system gnu-build-system)
(inputs `(("file" ,file)
("zlib" ,zlib)
(inputs `(("zlib" ,zlib)
("libjpeg-8" ,libjpeg-8)))
;; currently does not compile with libjpeg version 9
(native-inputs `(("file" ,file)))
(arguments
`(#:configure-flags
(list (string-append "--with-jpeg-include-dir="

25
gnu/packages/linux.scm
View File

@ -235,7 +235,7 @@ It has been modified to remove all non-free binary blobs.")
(base32
"1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s"))))
(build-system gnu-build-system)
(inputs
(native-inputs
`(("flex" ,flex)
;; TODO: optional dependencies
@ -314,8 +314,9 @@ providing the system administrator with some help in common tasks.")
(("@PERL@") "/bin/perl"))))
%standard-phases)))
(inputs `(("zlib" ,guix:zlib)
("ncurses" ,ncurses)
("perl" ,perl)))
("ncurses" ,ncurses)))
(native-inputs
`(("perl" ,perl)))
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
(synopsis "Collection of utilities for the Linux kernel")
(description
@ -395,7 +396,9 @@ slabtop, and skill.")
"03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr"))))
(build-system gnu-build-system)
(inputs
`(("libusb" ,libusb) ("pkg-config" ,pkg-config)))
`(("libusb" ,libusb)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.linux-usb.org/")
(synopsis
"Tools for working with USB devices, such as lsusb")
@ -415,8 +418,8 @@ slabtop, and skill.")
(base32
"0ibkkvp6kan0hn0d1anq4n2md70j5gcm7mwna515w82xwyr02rfw"))))
(build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux)
("pkg-config" ,pkg-config)))
(inputs `(("util-linux" ,util-linux)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
'(#:phases (alist-cons-before
'configure 'patch-shells
@ -454,7 +457,7 @@ slabtop, and skill.")
(base32
"158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)))
(native-inputs `(("perl" ,perl)))
(home-page "http://strace.sourceforge.net/")
(synopsis "System call tracer for Linux")
(description
@ -582,8 +585,9 @@ packet filter.")
%standard-phases)))
(inputs
`(("iptables" ,iptables)
("db4" ,bdb)
("pkg-config" ,pkg-config)
("db4" ,bdb)))
(native-inputs
`(("pkg-config" ,pkg-config)
("flex" ,flex)
("bison" ,bison)))
(home-page
@ -801,10 +805,11 @@ configuration and monitoring interfaces.")
(inputs
;; TODO: Add pciutils.
`(("zlib" ,guix:zlib)
("pkg-config" ,pkg-config)
;; ("pciutils" ,pciutils)
("ncurses" ,ncurses)
("libnl" ,libnl)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://01.org/powertop/")
(synopsis "Analyze power consumption on Intel-based laptops")
(description

2
gnu/packages/lvm.scm
View File

@ -38,7 +38,7 @@
(base32
"0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"))))
(build-system gnu-build-system)
(inputs
(native-inputs
`(("pkg-config" ,pkg-config)
("procps" ,procps)))
(arguments

8
gnu/packages/mp3.scm
View File

@ -147,8 +147,9 @@ a highly stable and efficient implementation.")
("libogg" ,libogg)
("libtool" ,libtool)
("libvorbid" ,libvorbis)
("pkg-config" ,pkg-config)
("pcre" ,pcre)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "libmp3splt, a library for splitting mp3 and ogg vorbis files")
(description
"Mp3splt is a utility to split mp3 and ogg vorbis files selecting a begin
@ -254,8 +255,9 @@ use with CD-recording software).")
(inputs
`(("glib" ,glib)
("gtk+" ,gtk+-2)
("id3lib" ,id3lib)
("pkg-config" ,pkg-config)))
("id3lib" ,id3lib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "GTK program to rip and encode CD audio tracks")
(description
"RipperX is a GTK program to rip CD audio tracks and encode them to the

11
gnu/packages/netpbm.scm
View File

@ -49,16 +49,17 @@
(sha256 (base32
"10nwvxc85kr6vhlhhahagy7s9848bbixl54b0p4ppim4g0dl10jz"))))
(build-system gnu-build-system)
(inputs `(("flex" ,flex)
("ghostscript" ,ghostscript)
(inputs `(("ghostscript" ,ghostscript)
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxml2" ,libxml2)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("zlib" ,zlib)))
(native-inputs
`(("flex" ,flex)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(arguments
`(#:phases
(alist-replace

2
gnu/packages/parallel.scm
View File

@ -37,7 +37,7 @@
(base32
"1l19grs8nimkninig4h0hfmnykm41j0amcvav6ic4wfd33v0lppg"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)))
(inputs `(("perl" ,perl)))
(home-page "http://www.gnu.org/software/parallel/")
(synopsis "Build and execute command lines in parallel")
(description

3
gnu/packages/parted.scm
View File

@ -53,9 +53,10 @@
(inputs
;; XXX: add 'lvm2'.
`(("check" ,check)
("gettext" ,gnu-gettext)
("readline" ,readline)
("util-linux" ,util-linux)))
(native-inputs
`(("gettext" ,gnu-gettext)))
(home-page "http://www.gnu.org/software/parted/")
(synopsis "Disk partition editor")
(description

3
gnu/packages/pdf.scm
View File

@ -59,7 +59,6 @@
("libjpeg-8" ,libjpeg-8)
("libpng" ,libpng)
("libtiff" ,libtiff)
("pkg-config" ,pkg-config)
("zlib" ,zlib)
;; To build poppler-glib (as needed by Evince), we need Cairo and
@ -68,6 +67,8 @@
(inputs (alist-delete "poppler"
(package-inputs cairo)))))
("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
`(#:tests? #f ; no test data provided with the tarball
#:configure-flags

7
gnu/packages/pulseaudio.scm
View File

@ -212,10 +212,11 @@ mixing several sounds into one are easily achieved using a sound server. ")
"02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"))))
(build-system gnu-build-system)
(inputs
`(("intltool" ,intltool)
("libcanberra" ,libcanberra)
`(("libcanberra" ,libcanberra)
("gtkmm" ,gtkmm)
("pulseaudio" ,pulseaudio)
("pulseaudio" ,pulseaudio)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(home-page "http://freedesktop.org/software/pulseaudio/pavucontrol/")
(synopsis "PulseAudio volume control")

7
gnu/packages/qemu.scm
View File

@ -95,7 +95,6 @@
(inputs ; TODO: Add optional inputs.
`(;; ("libaio" ,libaio)
("glib" ,glib)
("python" ,python-2) ; incompatible with Python 3 according to error message
("ncurses" ,ncurses)
("libpng" ,libpng)
("libjpeg" ,libjpeg-8)
@ -103,14 +102,14 @@
;; ("vde2" ,vde2)
("util-linux" ,util-linux)
;; ("pciutils" ,pciutils)
("pkg-config" ,pkg-config)
("alsa-lib" ,alsa-lib)
("zlib" ,zlib)
("attr" ,attr)
("samba" ,samba))) ; an optional dependency
(native-inputs `(("texinfo" ,texinfo)
(native-inputs `(("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3 according to error message
("texinfo" ,texinfo)
("perl" ,perl)))
(home-page "http://www.qemu-project.org")
(synopsis "Machine emulator and virtualizer (without GUI)")
(description

7
gnu/packages/qt.scm
View File

@ -51,7 +51,7 @@
(base32
"13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"))))
(build-system gnu-build-system)
(inputs
(native-inputs
`(("bison" ,bison)))
(home-page "http://xkbcommon.org/")
(synopsis "library to handle keyboard descriptions")
@ -97,8 +97,6 @@ X11 (yet).")
("libxrender" ,libxrender)
("mysql" ,mysql)
("openssl" ,openssl)
("perl" ,perl)
("pkg-config" ,pkg-config)
("pulseaudio" ,pulseaudio)
("python-wrapper" ,python-wrapper)
("xcb-util" ,xcb-util)
@ -107,6 +105,9 @@ X11 (yet).")
("xcb-util-renderutil" ,xcb-util-renderutil)
("xcb-util-wm" ,xcb-util-wm)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
(arguments
`(#:phases
(alist-replace

7
gnu/packages/ratpoison.scm
View File

@ -40,9 +40,7 @@
"0v4mh8d3vsh5xbbycfdl3g8zfygi1rkslh1x7k5hi1d05bfq3cdr"))))
(build-system gnu-build-system)
(inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("libXi" ,libxi)
`(("libXi" ,libxi)
("readline" ,readline)
("xextproto" ,xextproto)
("libXtst" ,libxtst)
@ -53,6 +51,9 @@
("libXt" ,libxt)
("inputproto" ,inputproto)
("libX11" ,libx11)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
(home-page "http://www.nongnu.org/ratpoison/")
(synopsis "A simple mouse-free tiling window manager")
(description

6
gnu/packages/rdf.scm
View File

@ -78,9 +78,9 @@ HTML and JSON.")
(build-system cmake-build-system)
;; FIXME: Add optional dependencies: Raptor, Redland, odbci, clucene; doxygen
(inputs
`(("pkg-config" ,pkg-config)
("raptor2" ,raptor2)
("qt" ,qt-4)))
`(("qt" ,qt-4)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://soprano.sourceforge.net/")
(synopsis "RDF data library for Qt")
(description "Soprano (formerly known as QRDF) is a library which

5
gnu/packages/slim.scm
View File

@ -50,11 +50,12 @@
("libxrender" ,libxrender)
("freetype" ,freetype)
("fontconfig" ,fontconfig)
("pkg-config" ,pkg-config)
("libx11" ,libx11)
("libx11" ,libx11)
("libxft" ,libxft)
("libxmu" ,libxmu)
("xauth" ,xauth)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
'(#:phases (alist-cons-before
'configure 'set-new-etc-location

9
gnu/packages/texlive.scm
View File

@ -75,18 +75,19 @@
("libpng" ,libpng)
("libxaw" ,libxaw)
("libxt" ,libxt)
("perl" ,perl)
("pixman" ,pixman)
("poppler" ,poppler)
("pkg-config" ,pkg-config)
;; FIXME: Add interpreters fontforge and ruby,
;; once they are available.
("python" ,python-2) ; incompatible with Python 3 (print syntax)
("tcsh" ,tcsh)
("teckit" ,teckit)
("t1lib" ,t1lib)
("zlib" ,zlib)
("zziplib" ,zziplib)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3 (print syntax)
("tcsh" ,tcsh)))
(outputs '("out" "data"))
(arguments
`(#:out-of-source? #t

12
gnu/packages/video.scm
View File

@ -44,18 +44,20 @@
"1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"))))
(build-system gnu-build-system)
(inputs
`(("bc" ,bc)
("bzip2" ,bzip2)
("fontconfig" ,fontconfig)
`(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("speex" ,speex)
("zlib", zlib)))
(native-inputs
`(("bc" ,bc)
("bzip2" ,bzip2)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2) ; scripts use interpreter python2
("speex" ,speex)
("yasm" ,yasm)
("zlib", zlib)))
("yasm" ,yasm)))
(arguments
`(#:test-target "fate"
#:phases

7
gnu/packages/vpn.scm
View File

@ -104,12 +104,13 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.")
"1rd8pap455wzkx19i0sy3cqap524b6fwcjvqynxp6lhm01di4bd6"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gnu-gettext)
("libxml2" ,libxml2)
`(("libxml2" ,libxml2)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
("vpnc" ,vpnc)
("zlib" ,zlib)))
(native-inputs
`(("gettext" ,gnu-gettext)
("pkg-config" ,pkg-config)))
(arguments
`(#:phases
(alist-replace

9
gnu/packages/w3m.scm
View File

@ -60,13 +60,14 @@
(("@PERL@") (which "perl"))))
%standard-phases)))
(inputs
`(("gettext" ,gnu-gettext)
("libgc" ,libgc)
`(("libgc" ,libgc)
("ncurses" ,ncurses)
("openssl" ,openssl)
("perl" ,perl)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(native-inputs
`(("gettext" ,gnu-gettext)
("perl" ,perl)
("pkg-config" ,pkg-config)))
(home-page "http://w3m.sourceforge.net/")
(synopsis "w3m, a text-mode web browser")
(description

6
gnu/packages/xml.scm
View File

@ -66,9 +66,9 @@ things the parser might find in the XML document (like start tags).")
(build-system gnu-build-system)
(home-page "http://www.xmlsoft.org/")
(synopsis "libxml2, a C parser for XML")
(inputs `(("perl" ,perl)
("python" ,python-2) ; incompatible with Python 3 (print syntax)
("zlib" ,zlib)))
(inputs `(("zlib" ,zlib)))
(native-inputs `(("perl" ,perl)
("python" ,python-2))) ; incompatible with Python 3 (print syntax)
(arguments
`(#:phases
(alist-replace

3
gnu/packages/xnee.scm
View File

@ -38,7 +38,6 @@
(build-system gnu-build-system)
(inputs
`(("recordproto" ,recordproto)
("pkg-config" ,pkg-config)
("inputproto" ,inputproto)
("libxi" ,libxi)
("libxtst" ,libxtst)
@ -46,6 +45,8 @@
("libxext" ,libxext)
("xproto" ,xproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/xnee/")
(synopsis "Record, replay and distribute user actions under X11")
(description

673
gnu/packages/xorg.scm
View File

File diff suppressed because it is too large Load Diff

13
gnu/packages/zip.scm
View File

@ -118,12 +118,13 @@ UnZip recreates the stored directory structure by default.")
(base32
"0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl) ; for the documentation
("pkg-config" ,pkg-config)
("python" ,python-2) ; for the documentation; Python 3 not supported,
; http://forums.gentoo.org/viewtopic-t-863161-start-0.html
("zip" ,zip) ; to create test files
("zlib" ,zlib)))
(inputs
`(("zlib" ,zlib)))
(native-inputs `(("perl" ,perl) ; for the documentation
("pkg-config" ,pkg-config)
("python" ,python-2) ; for the documentation; Python 3 not supported,
; http://forums.gentoo.org/viewtopic-t-863161-start-0.html
("zip" ,zip))) ; to create test files
(arguments
`(#:parallel-tests? #f)) ; since test files are created on the fly
(home-page "http://zziplib.sourceforge.net/")