From c4c4cc05979f2a2d0212963c5fe1b940d63a0958 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 15 Dec 2013 12:01:56 +0100 Subject: gnu: Move numerous "inputs" which should be "native-inputs". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/packages/linux.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f291dafefb..826a5d7a73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -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 -- cgit v1.2.3