* [PATCH 1/5] gnu: libxml2: Fixed cross-compilation.
@ 2013-12-14 17:43 John Darrington
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
` (4 more replies)
0 siblings, 5 replies; 24+ messages in thread
From: John Darrington @ 2013-12-14 17:43 UTC (permalink / raw)
To: guix-devel
* gnu/packages/xml.scm (libxml2): [(eq? (%current-target-system) #f)] assign "cross-libc"
to the variable glibc
---
gnu/packages/xml.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index e2bab7b..a5b8c78 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -75,7 +75,7 @@ things the parser might find in the XML document (like start tags).")
'install
(lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
(let ((install (assoc-ref %standard-phases 'install))
- (glibc (assoc-ref inputs "libc"))
+ (glibc (assoc-ref inputs ,(if (%current-target-system) "cross-libc" "libc")))
(out (assoc-ref outputs "out")))
(apply install args)
(chdir "python")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
@ 2013-12-14 17:43 ` John Darrington
2013-12-14 18:19 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 3/5] gnu: tzdata: Added "source" as input John Darrington
` (3 subsequent siblings)
4 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 17:43 UTC (permalink / raw)
To: guix-devel
*gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
and set the CC_FOR_BUILD variable.
*gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and
set the --with-gpg-error-prefix configure option.
*gnu/packages/gnupg.scm (libksba): Added libgpg-error as a native input and
set the --with-gpg-error-prefix configure option.
---
gnu/packages/gnupg.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e888109..8d26688 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -44,6 +44,12 @@
(base32
"0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("gcc" ,gcc-final)))
+ (arguments
+ `(,@(if (%current-target-system)
+ '(#:configure-flags '("CC_FOR_BUILD=gcc"))
+ '())))
(home-page "http://gnupg.org")
(synopsis
"Libgpg-error, a small library that defines common error values for all GnuPG components")
@@ -68,6 +74,12 @@ Daemon and possibly more in the future.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ `(#:configure-flags
+ (list (string-append "--with-gpg-error-prefix="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://gnupg.org/")
(synopsis "Cryptographic function library")
(description
@@ -118,6 +130,14 @@ provided.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ `(#:configure-flags (list
+ ,@(if (%current-target-system)
+ '("CC_FOR_BUILD=gcc")'())
+ (string-append "--with-gpg-error-prefix="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://www.gnupg.org")
(synopsis
"Libksba is a CMS and X.509 access library under development")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 3/5] gnu: tzdata: Added "source" as input.
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
@ 2013-12-14 17:43 ` John Darrington
2013-12-14 18:24 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 4/5] gnu: openssl: Fixed cross-compile issues John Darrington
` (2 subsequent siblings)
4 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 17:43 UTC (permalink / raw)
To: guix-devel
* gnu/packages/base.scm (tzdata): Add "source" as input.
---
gnu/packages/base.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 02f1b91..5f74271 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -535,7 +535,8 @@ with the Linux kernel.")
(delete-file-recursively (string-append out "/share/zoneinfo-posix"))
(delete-file-recursively (string-append out "/share/zoneinfo-leaps"))))
(alist-delete 'configure %standard-phases)))))
- (inputs `(("tzcode" ,(origin
+ (inputs `(("source" ,source)
+ ("tzcode" ,(origin
(method url-fetch)
(uri (string-append
"http://www.iana.org/time-zones/repository/releases/tzcode"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
2013-12-14 17:43 ` [PATCH 3/5] gnu: tzdata: Added "source" as input John Darrington
@ 2013-12-14 17:43 ` John Darrington
2013-12-14 17:57 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs" John Darrington
2013-12-14 17:48 ` [PATCH 1/5] gnu: libxml2: Fixed cross-compilation Ludovic Courtès
4 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 17:43 UTC (permalink / raw)
To: guix-devel
*gnu/packages/openssl.scm (openssl): Move perl from inputs to native-inputs.
Replace reference to target bash with the native bash or target bash as appropriate.
---
gnu/packages/openssl.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm
index ca72aa8..bacdcc5 100644
--- a/gnu/packages/openssl.scm
+++ b/gnu/packages/openssl.scm
@@ -35,9 +35,9 @@
(sha256 (base32
"1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"))))
(build-system gnu-build-system)
- (inputs `(("perl" ,perl)))
+ (native-inputs `(("perl" ,perl)))
(arguments
- '(#:parallel-build? #f
+ `(#:parallel-build? #f
#:parallel-tests? #f
#:test-target "test"
#:phases
@@ -52,8 +52,8 @@
(string-append "--prefix=" out)))))
(alist-cons-before
'patch-source-shebangs 'patch-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash")))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((bash (assoc-ref ,@(if (%current-target-system) '(native-inputs) '(inputs)) "bash")))
(substitute* (find-files "test" ".*")
(("/bin/sh")
(string-append bash "/bin/bash"))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs".
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
` (2 preceding siblings ...)
2013-12-14 17:43 ` [PATCH 4/5] gnu: openssl: Fixed cross-compile issues John Darrington
@ 2013-12-14 17:43 ` John Darrington
2013-12-14 21:48 ` Ludovic Courtès
2013-12-14 17:48 ` [PATCH 1/5] gnu: libxml2: Fixed cross-compilation Ludovic Courtès
4 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 17:43 UTC (permalink / raw)
To: guix-devel
* gnu/packages/avahi.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/cdrom.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/cryptsetup.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/curl.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/emacs.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/fontutils.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gdb.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/geeqie.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/ghostscript.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/glib.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gnome.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gnunet.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gnupg.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gnuzilla.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/graphviz.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/groff.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gstreamer.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gtk.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/gv.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/imagemagick.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/irssi.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/kde.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/libcanberra.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/libtiff.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/linux.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/lvm.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/mp3.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/netpbm.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/parted.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/pdf.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/pulseaudio.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/qemu.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/qt.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/ratpoison.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/rdf.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/slim.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/texlive.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/version-control.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/video.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/vpn.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/w3m.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/xml.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/xnee.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/xorg.scm : Moved dependencies from "inputs" to "native-inputs"
* gnu/packages/zip.scm : Moved dependencies from "inputs" to "native-inputs"
---
gnu/packages/algebra.scm | 4 +-
gnu/packages/avahi.scm | 9 +-
gnu/packages/cdrom.scm | 10 +-
gnu/packages/cryptsetup.scm | 7 +-
gnu/packages/curl.scm | 9 +-
gnu/packages/emacs.scm | 7 +-
gnu/packages/fontutils.scm | 5 +-
gnu/packages/gdb.scm | 5 +-
gnu/packages/geeqie.scm | 5 +-
gnu/packages/ghostscript.scm | 13 +-
gnu/packages/glib.scm | 12 +-
gnu/packages/gnome.scm | 45 +--
gnu/packages/gnunet.scm | 3 +-
gnu/packages/gnupg.scm | 3 +-
gnu/packages/gnuzilla.scm | 9 +-
gnu/packages/graphviz.scm | 7 +-
gnu/packages/groff.scm | 7 +-
gnu/packages/gstreamer.scm | 20 +-
gnu/packages/gtk.scm | 62 ++--
gnu/packages/gv.scm | 3 +-
gnu/packages/imagemagick.scm | 4 +-
| 5 +-
gnu/packages/kde.scm | 3 +-
gnu/packages/libcanberra.scm | 7 +-
gnu/packages/libtiff.scm | 4 +-
gnu/packages/linux.scm | 24 +-
gnu/packages/lvm.scm | 2 +-
gnu/packages/mp3.scm | 8 +-
gnu/packages/netpbm.scm | 13 +-
gnu/packages/parted.scm | 3 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/pulseaudio.scm | 7 +-
gnu/packages/qemu.scm | 7 +-
gnu/packages/qt.scm | 7 +-
gnu/packages/ratpoison.scm | 7 +-
gnu/packages/rdf.scm | 6 +-
gnu/packages/slim.scm | 5 +-
gnu/packages/texlive.scm | 9 +-
gnu/packages/version-control.scm | 2 +
gnu/packages/video.scm | 12 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/w3m.scm | 9 +-
gnu/packages/xml.scm | 7 +-
gnu/packages/xnee.scm | 3 +-
gnu/packages/xorg.scm | 674 ++++++++++++++++++++++----------------
gnu/packages/zip.scm | 7 +-
46 files changed, 628 insertions(+), 462 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 9cc079d..faab4ed 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -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
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 2d2a4a4..9273535 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -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
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index f667691..df5d077 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -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
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 8645e9e..c362a63 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -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
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 4f5d960..7072ed3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -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")
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c781135..cecfd60 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -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
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index fc9fb6a..d17843e 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -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
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 8757f05..de29f08 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -56,9 +56,10 @@
("gmp" ,gmp)
("readline" ,readline)
("ncurses" ,ncurses)
- ("python" ,python-wrapper)
- ("texinfo" ,texinfo)
("dejagnu" ,dejagnu)))
+ (native-inputs
+ `(("python" ,python-wrapper)
+ ("texinfo" ,texinfo)))
(home-page "http://www.gnu.org/software/gdb/")
(synopsis "The GNU debugger")
(description
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 9f182e9..b835406 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -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")
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 6d32b42..127256a 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -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.
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fc65f30..097a5d0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -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
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 713b64f..aa87332 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -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")
@@ -84,9 +85,10 @@ features to enable users to create their discs easily and quickly.")
"19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
(build-system gnu-build-system)
(inputs
+ `(("libxml2" ,libxml2)
+ ("libxslt" ,libxslt)))
+ (native-inputs
`(("intltool" ,intltool)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
("pkg-config" ,pkg-config)
("python-2" ,python-2)))
(arguments
@@ -114,12 +116,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 +179,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 +186,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 +213,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 +266,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 +294,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 +348,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")
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 850aad0..63bbf08 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -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
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 8d26688..b756313 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages gnupg)
#:use-module (guix licenses)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages base)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
#:use-module (gnu packages pth)
@@ -235,7 +236,7 @@ and every application benefits from this.")
(sha256 (base32
"1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
(build-system gnu-build-system)
- (inputs `(("perl" ,perl)
+ (native-inputs `(("perl" ,perl)
("python" ,python-wrapper)
("gpg" ,gnupg)))
(arguments
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8a0e23e..6b3f09c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -71,13 +71,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
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index d49b3d0..69886be 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -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.
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 21902eb..70a6bba 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -39,11 +39,12 @@
(sha256 (base32
"0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
(build-system gnu-build-system)
- (inputs `(("bison" ,bison)
- ("ghostscript" ,ghostscript)
+ (inputs `(("ghostscript" ,ghostscript)
+ ("netpbm" ,netpbm)
+ ("psutils" ,psutils)))
+ (native-inputs `(("bison" ,bison)
("netpbm" ,netpbm)
("perl" ,perl)
- ("psutils" ,psutils)
("texinfo" ,texinfo)))
(synopsis "Typesetting from plain text mixed with formatting commands")
(description
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 58625be..6ebd8c3 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -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)))))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5aa95fe..280558d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -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)
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm
index 6d3dbc4..3cb6d1a 100644
--- a/gnu/packages/gv.scm
+++ b/gnu/packages/gv.scm
@@ -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.
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 98cd51f..58045dd 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -76,8 +76,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/")
--git a/gnu/packages/irssi.scm b/gnu/packages/irssi.scm
index 671f560..da71bea 100644
--- a/gnu/packages/irssi.scm
+++ b/gnu/packages/irssi.scm
@@ -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")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aaf425d..2666e58 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -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/")
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 127ffea..c1e78c4 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -46,9 +46,10 @@
`(("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer)
("gtk+" ,gtk+)
- ("libtool" ,libtool)
- ("libvorbis" ,libvorbis)
- ("pkg-config" ,pkg-config)))
+ ("libvorbis" ,libvorbis)))
+ (native-inputs
+ `(("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
(home-page "http://0pointer.de/lennart/projects/libcanberra/")
(synopsis
"Implementation of the XDG Sound Theme and Name Specifications")
diff --git a/gnu/packages/libtiff.scm b/gnu/packages/libtiff.scm
index 71cd339..f90a2d3 100644
--- a/gnu/packages/libtiff.scm
+++ b/gnu/packages/libtiff.scm
@@ -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="
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f291daf..d25e80a 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
@@ -315,7 +315,9 @@ providing the system administrator with some help in common tasks.")
%standard-phases)))
(inputs `(("zlib" ,guix:zlib)
("ncurses" ,ncurses)
- ("perl" ,perl)))
+ ))
+ (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 +397,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 +419,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 +458,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 +586,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 +806,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
diff --git a/gnu/packages/lvm.scm b/gnu/packages/lvm.scm
index 9cf4ea8..5fa73a6 100644
--- a/gnu/packages/lvm.scm
+++ b/gnu/packages/lvm.scm
@@ -38,7 +38,7 @@
(base32
"0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"))))
(build-system gnu-build-system)
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)
("procps" ,procps)))
(arguments
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 5f69255..a8eeb95 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -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
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index c8d3603..52fd579 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -49,16 +49,19 @@
(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
diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm
index 34d29fd..45d6bf1 100644
--- a/gnu/packages/parted.scm
+++ b/gnu/packages/parted.scm
@@ -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
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 701eb58..b821aad 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -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
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 74c46a4..a2e8217 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -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")
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 4f9cdc8..0d7923b 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -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
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6aa467a..7d855a6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -50,7 +50,7 @@
(base32
"13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"))))
(build-system gnu-build-system)
- (inputs
+ (native-inputs
`(("bison" ,bison)))
(home-page "http://xkbcommon.org/")
(synopsis "library to handle keyboard descriptions")
@@ -98,8 +98,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)
@@ -108,6 +106,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
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 30e6c22..fb1bfd8 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -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
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 75e4cd1..1f2bc79 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -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
diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
index 91e45b6..1f19269 100644
--- a/gnu/packages/slim.scm
+++ b/gnu/packages/slim.scm
@@ -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
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 7c6f82b..085722d 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -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
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 82ccc1f..690ecd2 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -98,6 +98,8 @@ as well as the classic centralized workflow.")
;; For 'git gui', 'gitk', and 'git citool'.
("tcl" ,tcl)
("tk" ,tk)))
+
+
(outputs '("out" ; the core
"svn" ; git-svn
"gui")) ; gitk, git gui
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 199f7c2..1a90527 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -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
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index cded206..6fff0db 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -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
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index 64fa78a..1558d93 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -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
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index a5b8c78..f4e3905 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages xml)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages base)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
@@ -66,9 +67,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
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index c16d160..98c96e7 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -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
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b81cc8a..361c4b4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -61,8 +61,9 @@
(inputs
`(("libxext" ,libxext)
("libxmu" ,libxmu)
- ("libxt" ,libxt)
- ("pkg-config" ,pkg-config)))
+ ("libxt" ,libxt)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://xeyes.sourcearchive.com/")
(synopsis "A follow the mouse X demo")
(description "Xeyes is a demo program for x.org. It shows eyes
@@ -87,8 +88,9 @@ following the mouse.")
(build-system gnu-build-system)
(inputs
`(("libpng" ,libpng)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.pixman.org/")
(synopsis "pixman, a low-level pixel manipulation library")
(description "Pixman is a low-level software library for pixel
@@ -114,8 +116,9 @@ rasterisation.")
(build-system gnu-build-system)
(inputs
`(("libpciaccess" ,libpciaccess)
- ("libpthread-stubs" ,libpthread-stubs)
- ("pkg-config" ,pkg-config)))
+ ("libpthread-stubs" ,libpthread-stubs)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://dri.freedesktop.org/wiki/")
(synopsis "libdrm, direct rendering userspace library")
(description "The Direct Rendering Infrastructure, also known as the DRI,
@@ -202,8 +205,9 @@ tracking.")
"02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"))))
(build-system gnu-build-system)
(inputs
- `(("libxfont" ,libxfont)
- ("pkg-config" ,pkg-config)))
+ `(("libxfont" ,libxfont)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -225,7 +229,7 @@ tracking.")
(base32
"07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -248,8 +252,9 @@ tracking.")
"1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"))))
(build-system gnu-build-system)
(inputs
- `(("fixesproto" ,fixesproto)
- ("pkg-config" ,pkg-config)))
+ `(("fixesproto" ,fixesproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -271,7 +276,7 @@ tracking.")
(base32
"0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -293,7 +298,7 @@ tracking.")
(base32
"02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -337,8 +342,9 @@ tracking.")
"0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontscale" ,mkfontscale)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontscale" ,mkfontscale)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -363,8 +369,9 @@ tracking.")
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
- ("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ ("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
;; install fonts into subdirectory of package output instead of
@@ -394,8 +401,9 @@ tracking.")
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
- ("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ ("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -426,7 +434,7 @@ tracking.")
(base32
"16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -450,8 +458,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -486,8 +495,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -518,8 +528,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -546,8 +557,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -575,8 +587,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -600,8 +613,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -624,8 +638,9 @@ tracking.")
"19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -654,8 +669,9 @@ tracking.")
(inputs
`(("mkfontdir" ,mkfontdir)
("font-util" ,font-util)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -682,8 +698,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -708,8 +725,9 @@ tracking.")
(inputs
`(("mkfontdir" ,mkfontdir)
("font-util" ,font-util)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -736,8 +754,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -761,8 +780,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -786,8 +806,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -809,7 +830,7 @@ tracking.")
(base32
"15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -833,8 +854,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -857,8 +879,9 @@ tracking.")
"0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -880,7 +903,7 @@ tracking.")
(base32
"1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -902,7 +925,7 @@ tracking.")
(base32
"0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -925,8 +948,9 @@ tracking.")
"1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
(build-system gnu-build-system)
(inputs
- `(("libice" ,libice)
- ("pkg-config" ,pkg-config)))
+ `(("libice" ,libice)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -948,7 +972,7 @@ tracking.")
(base32
"1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -970,7 +994,7 @@ tracking.")
(base32
"0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1000,8 +1024,9 @@ tracking.")
`(("xextproto" ,xextproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("dmxproto" ,dmxproto)
- ("pkg-config" ,pkg-config)))
+ ("dmxproto" ,dmxproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1025,8 +1050,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
- ("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ ("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1051,8 +1077,9 @@ tracking.")
(inputs
`(("xtrans" ,xtrans)
("xproto" ,xproto)
- ("fontsproto" ,fontsproto)
- ("pkg-config" ,pkg-config)))
+ ("fontsproto" ,fontsproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1075,7 +1102,9 @@ tracking.")
"11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"))))
(build-system gnu-build-system)
(inputs
- `(("zlib" ,zlib) ("pkg-config" ,pkg-config)))
+ `(("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1097,7 +1126,7 @@ tracking.")
(base32
"16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1122,8 +1151,9 @@ tracking.")
(inputs
`(("xtrans" ,xtrans)
("util-linux" ,util-linux)
- ("libice" ,libice)
- ("pkg-config" ,pkg-config)))
+ ("libice" ,libice)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1149,8 +1179,9 @@ tracking.")
`(("xextproto" ,xextproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("windowswmproto" ,windowswmproto)
- ("pkg-config" ,pkg-config)))
+ ("windowswmproto" ,windowswmproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1176,8 +1207,9 @@ tracking.")
`(("xproto" ,xproto)
("libxfixes" ,libxfixes)
("libx11" ,libx11)
- ("compositeproto" ,compositeproto)
- ("pkg-config" ,pkg-config)))
+ ("compositeproto" ,compositeproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1200,7 +1232,9 @@ tracking.")
"13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1226,11 +1260,10 @@ tracking.")
`(("libx11" ,libx11)
("xproto" ,xproto)
("libxrender" ,libxrender)
- ("xproto" ,xproto)
- ("libx11" ,libx11)
("freetype" ,freetype)
- ("fontconfig" ,fontconfig)
- ("pkg-config" ,pkg-config)))
+ ("fontconfig" ,fontconfig)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1253,8 +1286,9 @@ tracking.")
"0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1279,8 +1313,9 @@ tracking.")
(inputs
`(("libxt" ,libxt)
("xproto" ,xproto)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1306,8 +1341,9 @@ tracking.")
`(("gettext" ,gnu-gettext)
("libxt" ,libxt)
("xproto" ,xproto)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1333,8 +1369,9 @@ tracking.")
`(("xproto" ,xproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("resourceproto" ,resourceproto)
- ("pkg-config" ,pkg-config)))
+ ("resourceproto" ,resourceproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1359,8 +1396,9 @@ tracking.")
(inputs
`(("libxext" ,libxext)
("libx11" ,libx11)
- ("scrnsaverproto" ,scrnsaverproto)
- ("pkg-config" ,pkg-config)))
+ ("scrnsaverproto" ,scrnsaverproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1385,8 +1423,9 @@ tracking.")
(inputs
`(("libx11" ,libx11)
("libxext" ,libxext)
- ("pkg-config" ,pkg-config)
("xf86dgaproto" ,xf86dgaproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1412,8 +1451,9 @@ tracking.")
(patches (list (search-patch "luit-posix.patch")))))
(build-system gnu-build-system)
(inputs
- `(("libfontenc" ,libfontenc)
- ("pkg-config" ,pkg-config)))
+ `(("libfontenc" ,libfontenc)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1436,7 +1476,8 @@ tracking.")
"1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1462,8 +1503,9 @@ tracking.")
`(("zlib" ,zlib)
("xproto" ,xproto)
("freetype" ,freetype)
- ("libfontenc" ,libfontenc)
- ("pkg-config" ,pkg-config)))
+ ("libfontenc" ,libfontenc)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1486,7 +1528,7 @@ tracking.")
(base32
"06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1508,7 +1550,7 @@ tracking.")
(base32
"0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1530,7 +1572,7 @@ tracking.")
(base32
"0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1552,7 +1594,7 @@ tracking.")
(base32
"0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1574,7 +1616,7 @@ tracking.")
(base32
"0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1596,7 +1638,7 @@ tracking.")
(base32
"0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1619,7 +1661,9 @@ tracking.")
"0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1643,8 +1687,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1668,8 +1713,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
- ("libxmu" ,libxmu)
- ("pkg-config" ,pkg-config)))
+ ("libxmu" ,libxmu)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1691,7 +1737,7 @@ tracking.")
(base32
"1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1713,7 +1759,7 @@ tracking.")
(base32
"0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1735,7 +1781,7 @@ tracking.")
(base32
"0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1761,8 +1807,9 @@ tracking.")
`(("libx11" ,libx11)
("libxft" ,libxft)
("libxmu" ,libxmu)
- ("libxrender" ,libxrender)
- ("pkg-config" ,pkg-config)))
+ ("libxrender" ,libxrender)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1788,8 +1835,9 @@ tracking.")
`(("libxmu" ,libxmu)
("libxext" ,libxext)
("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1814,8 +1862,9 @@ tracking.")
(inputs
`(("libx11" ,libx11)
("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("pkg-config" ,pkg-config)))
+ ("libxrender" ,libxrender)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1837,7 +1886,7 @@ tracking.")
(base32
"178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1859,7 +1908,7 @@ tracking.")
(base32
"0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
(build-system gnu-build-system)
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config) ("python" ,python-wrapper)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -1882,7 +1931,7 @@ tracking.")
(base32
"1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1905,8 +1954,9 @@ tracking.")
"03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1930,8 +1980,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxcursor" ,libxcursor)
- ("pkg-config" ,pkg-config)
("xcursorgen" ,xcursorgen)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-cursordir="
@@ -1960,8 +2011,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxcursor" ,libxcursor)
- ("libpng" ,libpng)
- ("pkg-config" ,pkg-config)))
+ ("libpng" ,libpng)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1993,8 +2045,9 @@ tracking.")
("libxinerama" ,libxinerama)
("libxi" ,libxi)
("libxcomposite" ,libxcomposite)
- ("libdmx" ,libdmx)
- ("pkg-config" ,pkg-config)))
+ ("libdmx" ,libdmx)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2018,8 +2071,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mesa" ,mesa)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2045,8 +2099,9 @@ tracking.")
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2068,7 +2123,7 @@ tracking.")
(base32
"06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2091,8 +2146,8 @@ tracking.")
"1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"))))
(build-system gnu-build-system)
;; FIXME: Add required input udev once it is available.
- (inputs `(("pkg-config" ,pkg-config)
- ("xorg-server" ,xorg-server)))
+ (inputs `(("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2114,8 +2169,8 @@ tracking.")
(base32
"1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"))))
(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)))
(arguments
`(#:configure-flags
(list (string-append "--with-sdkdir="
@@ -2142,8 +2197,8 @@ tracking.")
(base32
"1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2165,8 +2220,8 @@ tracking.")
(base32
"0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2191,8 +2246,8 @@ tracking.")
(inputs `(("libx11" ,libx11)
("libxi" ,libxi)
("mtdev" ,mtdev)
- ("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-sdkdir="
@@ -2222,8 +2277,8 @@ tracking.")
(base32
"16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"))))
(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)))
(arguments
`(#:configure-flags
(list(string-append "--with-xorg-conf-dir="
@@ -2250,8 +2305,8 @@ tracking.")
(base32
"01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2273,8 +2328,8 @@ tracking.")
(base32
"194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2296,8 +2351,8 @@ tracking.")
(base32
"1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2320,9 +2375,9 @@ tracking.")
"11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xxf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2344,8 +2399,8 @@ tracking.")
(base32
"0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2371,8 +2426,8 @@ tracking.")
(base32
"1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2444,9 +2499,9 @@ tracking.")
(base32
"0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2468,8 +2523,8 @@ tracking.")
(base32
"1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2493,8 +2548,9 @@ tracking.")
(build-system gnu-build-system)
(inputs `(("libdrm" ,libdrm)
("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2517,9 +2573,10 @@ tracking.")
"0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2542,9 +2599,9 @@ tracking.")
"03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2566,9 +2623,9 @@ tracking.")
(base32
"124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2590,8 +2647,8 @@ tracking.")
(base32
"1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2613,8 +2670,8 @@ tracking.")
(base32
"05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2640,9 +2697,10 @@ tracking.")
("libxext" ,libxext)
("libxvmc" ,libxvmc)
("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2665,9 +2723,9 @@ tracking.")
"1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2690,9 +2748,9 @@ tracking.")
"0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2714,8 +2772,8 @@ tracking.")
(base32
"01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2738,10 +2796,11 @@ tracking.")
"03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86dgaproto" ,xf86dgaproto)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2763,8 +2822,8 @@ tracking.")
(base32
"07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2786,8 +2845,8 @@ tracking.")
(base32
"04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2810,9 +2869,9 @@ tracking.")
"124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2834,9 +2893,9 @@ tracking.")
(base32
"0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2858,9 +2917,9 @@ tracking.")
(base32
"02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2886,8 +2945,8 @@ tracking.")
(base32
"0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2910,9 +2969,9 @@ tracking.")
"0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)
- ("xorg-server" ,xorg-server)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2934,9 +2993,9 @@ tracking.")
(base32
"0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3048,8 +3107,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxxf86vm" ,libxxf86vm)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3074,8 +3134,9 @@ tracking.")
(inputs
`(("libxmu" ,libxmu)
("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3097,7 +3158,7 @@ tracking.")
(base32
"0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3125,8 +3186,9 @@ tracking.")
("libxinerama" ,libxinerama)
("libxi" ,libxi)
("libx11" ,libx11)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3151,8 +3213,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3188,8 +3251,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3215,8 +3279,9 @@ tracking.")
`(("libxt" ,libxt)
("xproto" ,xproto)
("libxaw" ,libxaw)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3240,10 +3305,11 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("gettext" ,gnu-gettext)
- ("intltool" ,intltool)
("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xkbcomp-intermediate" ,xkbcomp-intermediate)))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3267,8 +3333,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3291,8 +3358,9 @@ tracking.")
"1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"))))
(build-system gnu-build-system)
(inputs
- `(("libxcb" ,libxcb)
- ("pkg-config" ,pkg-config)))
+ `(("libxcb" ,libxcb)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3315,8 +3383,9 @@ tracking.")
"1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"))))
(build-system gnu-build-system)
(inputs
- `(("libxcb" ,libxcb)
- ("pkg-config" ,pkg-config)))
+ `(("libxcb" ,libxcb)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3341,8 +3410,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3368,7 +3438,7 @@ tracking.")
(base32
"0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3393,8 +3463,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3418,8 +3489,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3445,8 +3517,9 @@ tracking.")
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3470,8 +3543,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3494,8 +3568,9 @@ tracking.")
"0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3521,8 +3596,9 @@ tracking.")
`(("xproto" ,xproto)
("libxmu" ,libxmu)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3547,8 +3623,9 @@ tracking.")
(inputs
`(("libxmu" ,libxmu)
("libxcursor" ,libxcursor)
- ("xbitmaps" ,xbitmaps)
- ("pkg-config" ,pkg-config)))
+ ("xbitmaps" ,xbitmaps)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3570,7 +3647,7 @@ tracking.")
(base32
"19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3595,8 +3672,9 @@ tracking.")
(inputs
`(("libxext" ,libxext)
("libxv" ,libxv)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3620,8 +3698,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
- ("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ ("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3645,8 +3724,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3670,8 +3750,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3698,7 +3779,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("xextproto" ,xextproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3726,8 +3807,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxfixes" ,libxfixes)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3753,8 +3835,9 @@ tracking.")
`(("xextproto" ,xextproto)))
(inputs
`(("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3780,8 +3863,9 @@ tracking.")
`(("xineramaproto" ,xineramaproto)))
(inputs
`(("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3808,8 +3892,9 @@ tracking.")
`(("printproto" ,printproto)))
(inputs
`(("libx11" ,libx11)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3835,8 +3920,9 @@ tracking.")
`(("renderproto" ,renderproto)))
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3863,8 +3949,9 @@ tracking.")
(inputs
`(("libxi" ,libxi)
("libx11" ,libx11)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3891,8 +3978,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3916,7 +4004,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("mkfontscale" ,mkfontscale)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3941,7 +4029,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3970,8 +4058,9 @@ tracking.")
(propagated-inputs
`(("xproto" ,xproto)))
(inputs
- `(("xtrans" ,xtrans)
- ("pkg-config" ,pkg-config)))
+ `(("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3995,7 +4084,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("xproto" ,xproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -4021,8 +4110,9 @@ tracking.")
`(("fixesproto" ,fixesproto)))
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4051,8 +4141,9 @@ tracking.")
("xproto" ,xproto)))
(inputs
`(("zlib" ,zlib)
- ("xtrans" ,xtrans)
- ("pkg-config" ,pkg-config)))
+ ("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4079,8 +4170,9 @@ tracking.")
("libx11" ,libx11)
("libxext" ,libxext)))
(inputs
- `(("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4108,8 +4200,9 @@ tracking.")
(inputs
`(("libxrender" ,libxrender)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4136,8 +4229,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4163,8 +4257,9 @@ tracking.")
`(("libxext" ,libxext)
("xf86vidmodeproto" ,xf86vidmodeproto)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4198,16 +4293,18 @@ tracking.")
("libxdamage" ,libxdamage)
("libxxf86vm" ,libxxf86vm)))
(inputs
- `(("bison" ,bison)
- ("dri2proto" ,dri2proto)
+ `(("dri2proto" ,dri2proto)
("expat" ,expat)
- ("flex" ,flex)
("libx11" ,libx11)
("libxfixes" ,libxfixes)
("libxml2" ,libxml2)
- ("makedepend" ,makedepend)
- ("pkg-config" ,pkg-config)
- ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
+ ("makedepend" ,makedepend)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("flex" ,flex)
+ ("bison" ,bison)
+ ("python" ,python-2) ; incompatible with Python 3 (print syntax)
+ ))
(arguments
`(#:configure-flags
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
@@ -4251,8 +4348,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxdmcp" ,libxdmcp)))
(inputs
`(("xcb-proto" ,xcb-proto)
- ("libxslt" ,libxslt)
- ("pkg-config" ,pkg-config)
+ ("libxslt" ,libxslt)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(arguments
`(#:configure-flags '("--enable-xkb")))
@@ -4309,8 +4407,6 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxt" ,libxt)
("libxv" ,libxv)
("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
("recordproto" ,recordproto)
("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
@@ -4323,6 +4419,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("xkeyboard-config" ,xkeyboard-config)
("xtrans" ,xtrans)
("zlib" ,zlib)))
+ (native-inputs
+ `(("python" ,python-wrapper)
+ ("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-xkb-path="
@@ -4372,9 +4471,10 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxcb" ,libxcb)))
(inputs
`(("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)
("xextproto" ,xextproto)
("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4403,7 +4503,7 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxrender" ,libxrender)
("libxfixes" ,libxfixes)
("xproto" ,xproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -4431,8 +4531,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libice" ,libice)
("libsm" ,libsm)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4460,8 +4561,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxpm" ,libxpm)
("libxt" ,libxt)))
(inputs
- `(("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4482,7 +4584,7 @@ emulation to complete hardware acceleration for modern GPUs.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util/")
(synopsis "Core XCB utility functions")
@@ -4515,8 +4617,9 @@ event: Some utilities that have little to do with events any more.")
(propagated-inputs
`(("libxcb" ,libxcb)))
(inputs
- `(("pkg-config" ,pkg-config)
- ("xcb-util" ,xcb-util)))
+ `(("xcb-util" ,xcb-util)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-image/")
(synopsis "XCB port of Xlib's XImage and XShmImage")
(description "The XCB util module provides a number of libraries which
@@ -4545,7 +4648,7 @@ image: Port of Xlib's XImage and XShmImage functions.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-keysyms/")
(synopsis "Standard X constants and conversion to/from keycodes")
@@ -4575,7 +4678,7 @@ keysyms: Standard X key constants and conversion to/from keycodes.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-renderutil/")
(synopsis "SConvenience functions for the Render extension")
@@ -4605,7 +4708,7 @@ renderutil: Convenience functions for the Render extension.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("m4" ,m4)
("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-wm/")
@@ -4645,8 +4748,9 @@ icccm: Both client and window-manager helpers for ICCCM.")
("libxmu" ,libxmu)
("libxt" ,libxt)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index f505d05..0d1616e 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -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
+ (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
- ("zlib" ,zlib)))
+ ("zip" ,zip))) ; to create test files
(arguments
`(#:parallel-tests? #f)) ; since test files are created on the fly
(home-page "http://zziplib.sourceforge.net/")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/5] gnu: libxml2: Fixed cross-compilation.
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
` (3 preceding siblings ...)
2013-12-14 17:43 ` [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs" John Darrington
@ 2013-12-14 17:48 ` Ludovic Courtès
4 siblings, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 17:48 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> * gnu/packages/xml.scm (libxml2): [(eq? (%current-target-system) #f)] assign "cross-libc"
> to the variable glibc
No need to show the condition in the log.
> --- a/gnu/packages/xml.scm
> +++ b/gnu/packages/xml.scm
> @@ -75,7 +75,7 @@ things the parser might find in the XML document (like start tags).")
> 'install
> (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
> (let ((install (assoc-ref %standard-phases 'install))
> - (glibc (assoc-ref inputs "libc"))
> + (glibc (assoc-ref inputs ,(if (%current-target-system) "cross-libc" "libc")))
Please wrap lines under 80 chars.
Could you send the updated patch?
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
2013-12-14 17:43 ` [PATCH 4/5] gnu: openssl: Fixed cross-compile issues John Darrington
@ 2013-12-14 17:57 ` Ludovic Courtès
2013-12-14 18:02 ` John Darrington
0 siblings, 1 reply; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 17:57 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> *gnu/packages/openssl.scm (openssl): Move perl from inputs to native-inputs.
> Replace reference to target bash with the native bash or target bash as appropriate.
(ChangeLog format and line length.)
> --- a/gnu/packages/openssl.scm
> +++ b/gnu/packages/openssl.scm
> @@ -35,9 +35,9 @@
> (sha256 (base32
> "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"))))
> (build-system gnu-build-system)
> - (inputs `(("perl" ,perl)))
> + (native-inputs `(("perl" ,perl)))
OK.
> @@ -52,8 +52,8 @@
> (string-append "--prefix=" out)))))
> (alist-cons-before
> 'patch-source-shebangs 'patch-tests
> - (lambda* (#:key inputs #:allow-other-keys)
> - (let ((bash (assoc-ref inputs "bash")))
> + (lambda* (#:key inputs native-inputs #:allow-other-keys)
> + (let ((bash (assoc-ref ,@(if (%current-target-system) '(native-inputs) '(inputs)) "bash")))
This can’t possibly work. It should be like:
(let ((bash (assoc-ref (or native-inputs inputs) "bash")))
...)
(Alternately, the ‘patch-tests’ could be skipped when cross-compiling
since we won’t run the tests.)
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
2013-12-14 17:57 ` Ludovic Courtès
@ 2013-12-14 18:02 ` John Darrington
2013-12-14 21:01 ` Ludovic Courtès
0 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 18:02 UTC (permalink / raw)
To: Ludovic Court??s; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
On Sat, Dec 14, 2013 at 06:57:59PM +0100, Ludovic Court??s wrote:
> @@ -52,8 +52,8 @@
> (string-append "--prefix=" out)))))
> (alist-cons-before
> 'patch-source-shebangs 'patch-tests
> - (lambda* (#:key inputs #:allow-other-keys)
> - (let ((bash (assoc-ref inputs "bash")))
> + (lambda* (#:key inputs native-inputs #:allow-other-keys)
> + (let ((bash (assoc-ref ,@(if (%current-target-system) '(native-inputs) '(inputs)) "bash")))
This can???t possibly work.
I did test it, both for native compilation and cross-compilation. In both cases
it built succesfully (unlike before the patch).
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
@ 2013-12-14 18:19 ` Ludovic Courtès
2013-12-14 19:02 ` John Darrington
0 siblings, 1 reply; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 18:19 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
> and set the CC_FOR_BUILD variable.
The implicit inputs when cross-compiling include both the cross-gcc and
the native gcc (see build-system/gnu.scm.)
AFAICS setting CC_FOR_BUILD=gcc should be enough (it uses ‘cc’ by
default.) Can you confirm.
> *gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and
> set the --with-gpg-error-prefix configure option.
This is wrong: libgcrypt would end up linking against the native libgpg-error.
> *gnu/packages/gnupg.scm (libksba): Added libgpg-error as a native input and
> set the --with-gpg-error-prefix configure option.
Ditto.
Also, please make sure to follow GNU ChangeLog style (star followed by
space, present tense, etc.)
Thanks for looking into this!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/5] gnu: tzdata: Added "source" as input.
2013-12-14 17:43 ` [PATCH 3/5] gnu: tzdata: Added "source" as input John Darrington
@ 2013-12-14 18:24 ` Ludovic Courtès
0 siblings, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 18:24 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
John Darrington <john@darrington.wattle.id.au> skribis:
> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -535,7 +535,8 @@ with the Linux kernel.")
> (delete-file-recursively (string-append out "/share/zoneinfo-posix"))
> (delete-file-recursively (string-append out "/share/zoneinfo-leaps"))))
> (alist-delete 'configure %standard-phases)))))
> - (inputs `(("tzcode" ,(origin
> + (inputs `(("source" ,source)
> + ("tzcode" ,(origin
> (method url-fetch)
Actually the problem was that “source” is in ‘native-inputs’ when
cross-compiling (see build-system/gnu.scm.)
I fixed it differently in commit c94d01b:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 532 bytes --]
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -520,8 +520,8 @@ with the Linux kernel.")
#:phases
(alist-replace
'unpack
- (lambda* (#:key inputs #:allow-other-keys)
- (and (zero? (system* "tar" "xvf" (assoc-ref inputs "source")))
+ (lambda* (#:key source inputs #:allow-other-keys)
+ (and (zero? (system* "tar" "xvf" source))
(zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))
(alist-cons-after
'install 'post-install
[-- Attachment #3: Type: text/plain, Size: 23 bytes --]
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 18:19 ` Ludovic Courtès
@ 2013-12-14 19:02 ` John Darrington
2013-12-14 21:06 ` Ludovic Courtès
0 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-14 19:02 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
On Sat, Dec 14, 2013 at 07:19:03PM +0100, Ludovic Courtès wrote:
John Darrington <john@darrington.wattle.id.au> skribis:
> *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
> and set the CC_FOR_BUILD variable.
The implicit inputs when cross-compiling include both the cross-gcc and
the native gcc (see build-system/gnu.scm.)
AFAICS setting CC_FOR_BUILD=gcc should be enough (it uses ‘cc’ by
default.) Can you confirm.
You are right. setting gcc as a native input seems to be unnecessary. Somewhat on
a tangent:
Would it not be a good idea to have CC_FOR_BUILD=gcc the default setting at least
fot the gnu build-system.
> *gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and
> set the --with-gpg-error-prefix configure option.
This is wrong: libgcrypt would end up linking against the native libgpg-error.
I think you are mistaken. The purpose of --with-gpg-error-prefix= is to set the path
of the library which it should be linked against. The issue is, that libgpg-error provides
both a binary (which must be run at configure time) AND a library which has to be linked.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
2013-12-14 18:02 ` John Darrington
@ 2013-12-14 21:01 ` Ludovic Courtès
2013-12-15 8:03 ` [PATCH] gnu: openssl: Fix " John Darrington
0 siblings, 1 reply; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 21:01 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> On Sat, Dec 14, 2013 at 06:57:59PM +0100, Ludovic Court??s wrote:
>
> > @@ -52,8 +52,8 @@
> > (string-append "--prefix=" out)))))
> > (alist-cons-before
> > 'patch-source-shebangs 'patch-tests
> > - (lambda* (#:key inputs #:allow-other-keys)
> > - (let ((bash (assoc-ref inputs "bash")))
> > + (lambda* (#:key inputs native-inputs #:allow-other-keys)
> > + (let ((bash (assoc-ref ,@(if (%current-target-system) '(native-inputs) '(inputs)) "bash")))
>
> This can???t possibly work.
>
> I did test it, both for native compilation and cross-compilation. In both cases
> it built succesfully (unlike before the patch).
Ah, sorry, I misread the unquoted part; apologies for that.
Still, I’d prefer the simpler (because it’s build-side code only):
(assoc-ref (or native-inputs inputs) "bash")
WDYT?
Could you send an updated patch if that’s fine with you?
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 19:02 ` John Darrington
@ 2013-12-14 21:06 ` Ludovic Courtès
2013-12-15 8:24 ` John Darrington
2014-01-07 10:32 ` John Darrington
0 siblings, 2 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 21:06 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> On Sat, Dec 14, 2013 at 07:19:03PM +0100, Ludovic Courtès wrote:
> John Darrington <john@darrington.wattle.id.au> skribis:
>
> > *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
> > and set the CC_FOR_BUILD variable.
>
> The implicit inputs when cross-compiling include both the cross-gcc and
> the native gcc (see build-system/gnu.scm.)
>
> AFAICS setting CC_FOR_BUILD=gcc should be enough (it uses ‘cc’ by
> default.) Can you confirm.
>
> You are right. setting gcc as a native input seems to be unnecessary. Somewhat on
> a tangent:
> Would it not be a good idea to have CC_FOR_BUILD=gcc the default setting at least
> fot the gnu build-system.
Yeah, perhaps we could add that when cross building (we have only two
occurrences currently, but it may be needed quite often.)
> > *gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and
> > set the --with-gpg-error-prefix configure option.
>
> This is wrong: libgcrypt would end up linking against the native libgpg-error.
>
> I think you are mistaken. The purpose of --with-gpg-error-prefix= is to set the path
> of the library which it should be linked against. The issue is, that libgpg-error provides
> both a binary (which must be run at configure time) AND a library which has to be linked.
Oh indeed, I was unaware of that. So that explains why libgpg-error
must be passed both as a native and target input.
However, is --with-gpg-error-prefix really needed? By default the cross
gcc will find the target libgpg-error in its search path, and not the
native one, so I would guess this is OK.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs".
2013-12-14 17:43 ` [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs" John Darrington
@ 2013-12-14 21:48 ` Ludovic Courtès
2013-12-15 10:36 ` John Darrington
0 siblings, 1 reply; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-14 21:48 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
Thanks for auditing all this!
John Darrington <john@darrington.wattle.id.au> skribis:
> * gnu/packages/avahi.scm : Moved dependencies from "inputs" to "native-inputs"
> * gnu/packages/cdrom.scm : Moved dependencies from "inputs" to "native-inputs"
Please use standard notation, like:
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm: Move some build-time
dependencies from ‘inputs’ to ‘native-inputs’.
Comments inline. This is OK unless otherwise specified.
> --- a/gnu/packages/avahi.scm
> +++ b/gnu/packages/avahi.scm
> @@ -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)))
^
Incorrect alignment here.
> --- a/gnu/packages/gdb.scm
> +++ b/gnu/packages/gdb.scm
> @@ -56,9 +56,10 @@
> ("gmp" ,gmp)
> ("readline" ,readline)
> ("ncurses" ,ncurses)
> - ("python" ,python-wrapper)
> - ("texinfo" ,texinfo)
> ("dejagnu" ,dejagnu)))
> + (native-inputs
> + `(("python" ,python-wrapper)
> + ("texinfo" ,texinfo)))
Python must really be an input (GDB can use it as its extension
language–until it’s superseded by Guile :-)), and not a native input.
> --- a/gnu/packages/geeqie.scm
> +++ b/gnu/packages/geeqie.scm
> @@ -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)))
Alignment.
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -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)))
‘dbus’ should be in ‘inputs’.
Alignment issue.
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -84,9 +85,10 @@ features to enable users to create their discs easily and quickly.")
> "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
> (build-system gnu-build-system)
> (inputs
> + `(("libxml2" ,libxml2)
> + ("libxslt" ,libxslt)))
> + (native-inputs
> `(("intltool" ,intltool)
> - ("libxml2" ,libxml2)
> - ("libxslt" ,libxslt)
> ("pkg-config" ,pkg-config)
> ("python-2" ,python-2)))
> (arguments
Running:
guix gc --references $(guix build gnome-doc-utils)
doesn’t show libxml2 and libxslt, so I think they are used for their
binaries (xsltproc, etc.) at build time. Thus, they should be in
‘native-inputs’.
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 8d26688..b756313 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -20,6 +20,7 @@
> (define-module (gnu packages gnupg)
> #:use-module (guix licenses)
> #:use-module (gnu packages curl)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages openldap)
> #:use-module (gnu packages perl)
> #:use-module (gnu packages pth)
> @@ -235,7 +236,7 @@ and every application benefits from this.")
> (sha256 (base32
> "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
> (build-system gnu-build-system)
> - (inputs `(("perl" ,perl)
> + (native-inputs `(("perl" ,perl)
> ("python" ,python-wrapper)
> ("gpg" ,gnupg)))
What’s going on here?
> --- a/gnu/packages/graphviz.scm
> +++ b/gnu/packages/graphviz.scm
> @@ -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)))
Alignment.
> --- a/gnu/packages/groff.scm
> +++ b/gnu/packages/groff.scm
> @@ -39,11 +39,12 @@
> (sha256 (base32
> "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
> (build-system gnu-build-system)
> - (inputs `(("bison" ,bison)
> - ("ghostscript" ,ghostscript)
> + (inputs `(("ghostscript" ,ghostscript)
> + ("netpbm" ,netpbm)
> + ("psutils" ,psutils)))
> + (native-inputs `(("bison" ,bison)
> ("netpbm" ,netpbm)
> ("perl" ,perl)
> - ("psutils" ,psutils)
> ("texinfo" ,texinfo)))
I think ‘psutils’ should be ‘native-inputs’ (it’s a set of programs.)
Alignment issue.
> --- a/gnu/packages/libcanberra.scm
> +++ b/gnu/packages/libcanberra.scm
> @@ -46,9 +46,10 @@
> `(("alsa-lib" ,alsa-lib)
> ("gstreamer" ,gstreamer)
> ("gtk+" ,gtk+)
> - ("libtool" ,libtool)
> - ("libvorbis" ,libvorbis)
> - ("pkg-config" ,pkg-config)))
> + ("libvorbis" ,libvorbis)))
> + (native-inputs
> + `(("libtool" ,libtool)
> + ("pkg-config" ,pkg-config)))
Libtool should be in ‘inputs’, because it’s for libltdl (‘libtool’ is a
multiple-output package, and it’s default output contains just libltdl.)
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -315,7 +315,9 @@ providing the system administrator with some help in common tasks.")
> %standard-phases)))
> (inputs `(("zlib" ,guix:zlib)
> ("ncurses" ,ncurses)
> - ("perl" ,perl)))
> + ))
> + (native-inputs
> + `(("perl" ,perl)))
Alignment.
> @@ -395,7 +397,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)))
Alignment.
> @@ -801,10 +806,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)))
Alignment.
> --- a/gnu/packages/slim.scm
> +++ b/gnu/packages/slim.scm
> @@ -50,11 +50,12 @@
> ("libxrender" ,libxrender)
> ("freetype" ,freetype)
> ("fontconfig" ,fontconfig)
> - ("pkg-config" ,pkg-config)
> - ("libx11" ,libx11)
> + ("libx11" ,libx11)
Alignment.
> --- a/gnu/packages/texlive.scm
> +++ b/gnu/packages/texlive.scm
> @@ -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)
Alignment.
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -98,6 +98,8 @@ as well as the classic centralized workflow.")
> ;; For 'git gui', 'gitk', and 'git citool'.
> ("tcl" ,tcl)
> ("tk" ,tk)))
> +
> +
Unneeded.
> --- a/gnu/packages/xml.scm
> +++ b/gnu/packages/xml.scm
> @@ -20,6 +20,7 @@
> (define-module (gnu packages xml)
> #:use-module (gnu packages)
> #:use-module (gnu packages compression)
> + #:use-module (gnu packages base)
Unneeded.
> @@ -66,9 +67,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)
Alignment.
xorg.scm:
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("flex" ,flex)
> + ("bison" ,bison)
> + ("python" ,python-2) ; incompatible with Python 3 (print syntax)
> + ))
Alignment; hanging parens.
> --- a/gnu/packages/zip.scm
> +++ b/gnu/packages/zip.scm
> @@ -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
> + (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
> - ("zlib" ,zlib)))
> + ("zip" ,zip))) ; to create test files
Alignment.
There are several formatting issue. If you’re using Emacs, make sure it
honors our .dir-locals.el (which GNU Emacs >= 23 normally does) and that
you’re in scheme-mode when editing.
If you’re using another editor, then it’d be great to provide a setup
file that does the right thing wrt. to formatting.
Could you send an updated patch?
Thank you for the long and tedious work!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] gnu: openssl: Fix cross-compile issues.
2013-12-14 21:01 ` Ludovic Courtès
@ 2013-12-15 8:03 ` John Darrington
2013-12-15 21:18 ` Ludovic Courtès
0 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-15 8:03 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* gnu/packages/openssl.scm (openssl): Move perl from inputs to
native-inputs.
Replace reference to target bash with the native bash or target bash as
appropriate.
---
gnu/packages/openssl.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm
index ca72aa8..438e76f 100644
--- a/gnu/packages/openssl.scm
+++ b/gnu/packages/openssl.scm
@@ -35,7 +35,7 @@
(sha256 (base32
"1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"))))
(build-system gnu-build-system)
- (inputs `(("perl" ,perl)))
+ (native-inputs `(("perl" ,perl)))
(arguments
'(#:parallel-build? #f
#:parallel-tests? #f
@@ -52,8 +52,8 @@
(string-append "--prefix=" out)))))
(alist-cons-before
'patch-source-shebangs 'patch-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash")))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
(substitute* (find-files "test" ".*")
(("/bin/sh")
(string-append bash "/bin/bash"))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 21:06 ` Ludovic Courtès
@ 2013-12-15 8:24 ` John Darrington
2013-12-15 8:39 ` [PATCH] gnu: gnupg: Fix " John Darrington
2013-12-15 21:14 ` [PATCH 2/5] gnu: gnupg: Fixed " Ludovic Courtès
2014-01-07 10:32 ` John Darrington
1 sibling, 2 replies; 24+ messages in thread
From: John Darrington @ 2013-12-15 8:24 UTC (permalink / raw)
To: Ludovic Court??s; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2899 bytes --]
On Sat, Dec 14, 2013 at 10:06:13PM +0100, Ludovic Court??s wrote:
John Darrington <john@darrington.wattle.id.au> skribis:
> On Sat, Dec 14, 2013 at 07:19:03PM +0100, Ludovic Court??s wrote:
> John Darrington <john@darrington.wattle.id.au> skribis:
>
> > *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
> > and set the CC_FOR_BUILD variable.
>
> The implicit inputs when cross-compiling include both the cross-gcc and
> the native gcc (see build-system/gnu.scm.)
>
> AFAICS setting CC_FOR_BUILD=gcc should be enough (it uses ???cc??? by
> default.) Can you confirm.
>
> You are right. setting gcc as a native input seems to be unnecessary. Somewhat on
> a tangent:
> Would it not be a good idea to have CC_FOR_BUILD=gcc the default setting at least
> fot the gnu build-system.
Yeah, perhaps we could add that when cross building (we have only two
occurrences currently, but it may be needed quite often.)
Pspp should have CC_FOR_BUILD set, but doesn't currently.
However, is --with-gpg-error-prefix really needed? By default the cross
gcc will find the target libgpg-error in its search path, and not the
native one, so I would guess this is OK.
Without --with-gpg-error-prefix I get the following error when cross compiling:
libtool: link: mips64el-linux-gnu-gcc -shared -fPIC -DPIC .libs/libgcrypt_la-visibility.o .libs/libgcrypt_la-misc.o .libs/libgcrypt_la-global.o .libs/libgcrypt_la-sexp.o .libs/libgcrypt_la-hwfeatures.o .libs/libgcrypt_la-stdmem.o .libs/libgcrypt_la-secmem.o .libs/libgcrypt_la-missing-string.o .libs/libgcrypt_la-module.o .libs/libgcrypt_la-fips.o .libs/libgcrypt_la-hmac256.o .libs/libgcrypt_la-ath.o -Wl,--whole-archive ../cipher/.libs/libcipher.a ../random/.libs/librandom.a ../mpi/.libs/libmpi.a ../compat/.libs/libcompat.a -Wl,--no-whole-archive -Wl,-rpath -Wl,/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib -Wl,-rpath -Wl,/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib -L/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib /nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib/libgpg-error.so -O2 -Wl,--version-script=./libgcrypt.vers -Wl,-soname -Wl,libgcrypt.so.11 -o .libs/libgcrypt.so.11.8.2
/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib/libgpg-error.so: could not read symbols: File in wrong format
collect2: error: ld returned 1 exit status
Makefile:493: recipe for target 'libgcrypt.la' failed
make[2]: *** [libgcrypt.la] Error 1
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] gnu: gnupg: Fix cross-compile issues.
2013-12-15 8:24 ` John Darrington
@ 2013-12-15 8:39 ` John Darrington
2013-12-15 21:24 ` Ludovic Courtès
2013-12-15 21:14 ` [PATCH 2/5] gnu: gnupg: Fixed " Ludovic Courtès
1 sibling, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-15 8:39 UTC (permalink / raw)
To: guix-devel
From: John Darrington <john@darrington.wattle.id.au>
* gnu/packages/gnupg.scm (libgpg-error): Add gcc as a native input,
and set the CC_FOR_BUILD variable.
* gnu/packages/gnupg.scm (libgcrypt): Add libgpg-error as a native input and
set the --with-gpg-error-prefix configure option.
* gnu/packages/gnupg.scm (libksba): Add libgpg-error as a native input and
set the --with-gpg-error-prefix configure option.
---
gnu/packages/gnupg.scm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e888109..d83df50 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -44,6 +44,10 @@
(base32
"0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
(build-system gnu-build-system)
+ (arguments
+ `(,@(if (%current-target-system)
+ '(#:configure-flags '("CC_FOR_BUILD=gcc"))
+ '())))
(home-page "http://gnupg.org")
(synopsis
"Libgpg-error, a small library that defines common error values for all GnuPG components")
@@ -68,6 +72,12 @@ Daemon and possibly more in the future.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ `(#:configure-flags
+ (list (string-append "--with-gpg-error-prefix="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://gnupg.org/")
(synopsis "Cryptographic function library")
(description
@@ -118,6 +128,14 @@ provided.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ `(#:configure-flags (list
+ ,@(if (%current-target-system)
+ '("CC_FOR_BUILD=gcc")'())
+ (string-append "--with-gpg-error-prefix="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://www.gnupg.org")
(synopsis
"Libksba is a CMS and X.509 access library under development")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs".
2013-12-14 21:48 ` Ludovic Courtès
@ 2013-12-15 10:36 ` John Darrington
2013-12-15 11:01 ` [PATCH] gnu: Move numerous " John Darrington
0 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-15 10:36 UTC (permalink / raw)
To: Ludovic Court??s; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 6214 bytes --]
On Sat, Dec 14, 2013 at 10:48:07PM +0100, Ludovic Court??s wrote:
Thanks for auditing all this!
> --- a/gnu/packages/gdb.scm
> +++ b/gnu/packages/gdb.scm
> @@ -56,9 +56,10 @@
> ("gmp" ,gmp)
> ("readline" ,readline)
> ("ncurses" ,ncurses)
> - ("python" ,python-wrapper)
> - ("texinfo" ,texinfo)
> ("dejagnu" ,dejagnu)))
> + (native-inputs
> + `(("python" ,python-wrapper)
> + ("texinfo" ,texinfo)))
Python must really be an input (GDB can use it as its extension
language???until it???s superseded by Guile :-)), and not a native input.
OK. I wasn't sure.
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -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)))
???dbus??? should be in ???inputs???.
OK.
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -84,9 +85,10 @@ features to enable users to create their discs easily and quickly.")
> "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
> (build-system gnu-build-system)
> (inputs
> + `(("libxml2" ,libxml2)
> + ("libxslt" ,libxslt)))
> + (native-inputs
> `(("intltool" ,intltool)
> - ("libxml2" ,libxml2)
> - ("libxslt" ,libxslt)
> ("pkg-config" ,pkg-config)
> ("python-2" ,python-2)))
> (arguments
Running:
guix gc --references $(guix build gnome-doc-utils)
doesn???t show libxml2 and libxslt, so I think they are used for their
binaries (xsltproc, etc.) at build time. Thus, they should be in
???native-inputs???.
OK. I'll put them back for now. There are a lot of other issues preventing Gnome from cross compiling
so we'll deal with the issue later, if it arises.
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 8d26688..b756313 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -20,6 +20,7 @@
> (define-module (gnu packages gnupg)
> #:use-module (guix licenses)
> #:use-module (gnu packages curl)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages openldap)
> #:use-module (gnu packages perl)
> #:use-module (gnu packages pth)
> @@ -235,7 +236,7 @@ and every application benefits from this.")
> (sha256 (base32
> "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
> (build-system gnu-build-system)
> - (inputs `(("perl" ,perl)
> + (native-inputs `(("perl" ,perl)
> ("python" ,python-wrapper)
> ("gpg" ,gnupg)))
What???s going on here?
This is probably erroneous. I'll revert it.
> --- a/gnu/packages/groff.scm
> +++ b/gnu/packages/groff.scm
> @@ -39,11 +39,12 @@
> (sha256 (base32
> "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
> (build-system gnu-build-system)
> - (inputs `(("bison" ,bison)
> - ("ghostscript" ,ghostscript)
> + (inputs `(("ghostscript" ,ghostscript)
> + ("netpbm" ,netpbm)
> + ("psutils" ,psutils)))
> + (native-inputs `(("bison" ,bison)
> ("netpbm" ,netpbm)
> ("perl" ,perl)
> - ("psutils" ,psutils)
> ("texinfo" ,texinfo)))
I think ???psutils??? should be ???native-inputs??? (it???s a set of programs.)
Ok. I'll put it back. (Ghostscript has some big cross-compile issues anyway)
> --- a/gnu/packages/libcanberra.scm
> +++ b/gnu/packages/libcanberra.scm
> @@ -46,9 +46,10 @@
> `(("alsa-lib" ,alsa-lib)
> ("gstreamer" ,gstreamer)
> ("gtk+" ,gtk+)
> - ("libtool" ,libtool)
> - ("libvorbis" ,libvorbis)
> - ("pkg-config" ,pkg-config)))
> + ("libvorbis" ,libvorbis)))
> + (native-inputs
> + `(("libtool" ,libtool)
> + ("pkg-config" ,pkg-config)))
Libtool should be in ???inputs???, because it???s for libltdl (???libtool??? is a
multiple-output package, and it???s default output contains just libltdl.)
There are several formatting issue. If you???re using Emacs, make sure it
honors our .dir-locals.el (which GNU Emacs >= 23 normally does) and that
you???re in scheme-mode when editing.
I was indeed using Emacs (23.4.1) in scheme mode. Please also note that the reference mentioned
in HACKING (http://mumble.net/~campbell/scheme/style.txt) regards as acceptable, many of the
styles you wanted changed. I will however send a patch according to your suggestions.
Updated patch forthcomming (hopefully).
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] gnu: Move numerous "inputs" which should be "native-inputs".
2013-12-15 10:36 ` John Darrington
@ 2013-12-15 11:01 ` John Darrington
2013-12-15 21:32 ` Ludovic Courtès
0 siblings, 1 reply; 24+ messages in thread
From: John Darrington @ 2013-12-15 11:01 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* 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'.
---
gnu/packages/algebra.scm | 4 +-
gnu/packages/avahi.scm | 9 +-
gnu/packages/cdrom.scm | 10 +-
gnu/packages/cryptsetup.scm | 7 +-
gnu/packages/curl.scm | 9 +-
gnu/packages/emacs.scm | 7 +-
gnu/packages/fontutils.scm | 5 +-
gnu/packages/gdb.scm | 3 +-
gnu/packages/geeqie.scm | 5 +-
gnu/packages/ghostscript.scm | 13 +-
gnu/packages/glib.scm | 12 +-
gnu/packages/gnome.scm | 42 +--
gnu/packages/gnunet.scm | 3 +-
gnu/packages/gnuzilla.scm | 9 +-
gnu/packages/graphviz.scm | 7 +-
gnu/packages/groff.scm | 6 +-
gnu/packages/gstreamer.scm | 20 +-
gnu/packages/gtk.scm | 62 ++--
gnu/packages/gv.scm | 3 +-
gnu/packages/imagemagick.scm | 4 +-
| 5 +-
gnu/packages/kde.scm | 3 +-
gnu/packages/libcanberra.scm | 5 +-
gnu/packages/libtiff.scm | 4 +-
gnu/packages/linux.scm | 25 +-
gnu/packages/lvm.scm | 2 +-
gnu/packages/mp3.scm | 8 +-
gnu/packages/netpbm.scm | 11 +-
gnu/packages/parted.scm | 3 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/pulseaudio.scm | 7 +-
gnu/packages/qemu.scm | 7 +-
gnu/packages/qt.scm | 7 +-
gnu/packages/ratpoison.scm | 7 +-
gnu/packages/rdf.scm | 6 +-
gnu/packages/slim.scm | 5 +-
gnu/packages/texlive.scm | 9 +-
gnu/packages/video.scm | 12 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/w3m.scm | 9 +-
gnu/packages/xml.scm | 6 +-
gnu/packages/xnee.scm | 3 +-
gnu/packages/xorg.scm | 673 ++++++++++++++++++++++++------------------
gnu/packages/zip.scm | 13 +-
44 files changed, 618 insertions(+), 462 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 9cc079d..faab4ed 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -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
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 2d2a4a4..bc70878 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -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
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index f667691..df5d077 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -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
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 8645e9e..c362a63 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -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
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 4f5d960..7072ed3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -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")
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c781135..cecfd60 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -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
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index fc9fb6a..d17843e 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -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
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 8757f05..5a863e5 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -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
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 9f182e9..2927f2d 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -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")
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 6d32b42..127256a 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -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.
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fc65f30..097a5d0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -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
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 713b64f..0c1b047 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -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")
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 850aad0..63bbf08 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -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
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 67e451d..c3f464c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -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
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index d49b3d0..eb54b5d 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -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.
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 21902eb..ad7cff3 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -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)))
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 58625be..6ebd8c3 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -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)))))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5aa95fe..280558d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -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)
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm
index 6d3dbc4..3cb6d1a 100644
--- a/gnu/packages/gv.scm
+++ b/gnu/packages/gv.scm
@@ -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.
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 61a24f1..0d57473 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -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/")
--git a/gnu/packages/irssi.scm b/gnu/packages/irssi.scm
index 671f560..da71bea 100644
--- a/gnu/packages/irssi.scm
+++ b/gnu/packages/irssi.scm
@@ -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")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aaf425d..2666e58 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -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/")
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 127ffea..dacbe31 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -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")
diff --git a/gnu/packages/libtiff.scm b/gnu/packages/libtiff.scm
index 71cd339..f90a2d3 100644
--- a/gnu/packages/libtiff.scm
+++ b/gnu/packages/libtiff.scm
@@ -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="
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f291daf..826a5d7 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
diff --git a/gnu/packages/lvm.scm b/gnu/packages/lvm.scm
index 9cf4ea8..5fa73a6 100644
--- a/gnu/packages/lvm.scm
+++ b/gnu/packages/lvm.scm
@@ -38,7 +38,7 @@
(base32
"0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"))))
(build-system gnu-build-system)
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)
("procps" ,procps)))
(arguments
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 5f69255..a8eeb95 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -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
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index c8d3603..01d672e 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -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
diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm
index 34d29fd..45d6bf1 100644
--- a/gnu/packages/parted.scm
+++ b/gnu/packages/parted.scm
@@ -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
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 701eb58..b821aad 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -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
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 74c46a4..a2e8217 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -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")
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 4f9cdc8..0d7923b 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -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
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c858956..e40ae81 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -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
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 30e6c22..fb1bfd8 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -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
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 75e4cd1..1f2bc79 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -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
diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
index 91e45b6..fd2c73c 100644
--- a/gnu/packages/slim.scm
+++ b/gnu/packages/slim.scm
@@ -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
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 7c6f82b..e251137 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -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
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 199f7c2..1a90527 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -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
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index cded206..6fff0db 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -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
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index 64fa78a..1558d93 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -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
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 81e3948..3565903 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -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
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index c16d160..98c96e7 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -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
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b81cc8a..841d140 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -61,8 +61,9 @@
(inputs
`(("libxext" ,libxext)
("libxmu" ,libxmu)
- ("libxt" ,libxt)
- ("pkg-config" ,pkg-config)))
+ ("libxt" ,libxt)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://xeyes.sourcearchive.com/")
(synopsis "A follow the mouse X demo")
(description "Xeyes is a demo program for x.org. It shows eyes
@@ -87,8 +88,9 @@ following the mouse.")
(build-system gnu-build-system)
(inputs
`(("libpng" ,libpng)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.pixman.org/")
(synopsis "pixman, a low-level pixel manipulation library")
(description "Pixman is a low-level software library for pixel
@@ -114,8 +116,9 @@ rasterisation.")
(build-system gnu-build-system)
(inputs
`(("libpciaccess" ,libpciaccess)
- ("libpthread-stubs" ,libpthread-stubs)
- ("pkg-config" ,pkg-config)))
+ ("libpthread-stubs" ,libpthread-stubs)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://dri.freedesktop.org/wiki/")
(synopsis "libdrm, direct rendering userspace library")
(description "The Direct Rendering Infrastructure, also known as the DRI,
@@ -202,8 +205,9 @@ tracking.")
"02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"))))
(build-system gnu-build-system)
(inputs
- `(("libxfont" ,libxfont)
- ("pkg-config" ,pkg-config)))
+ `(("libxfont" ,libxfont)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -225,7 +229,7 @@ tracking.")
(base32
"07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -248,8 +252,9 @@ tracking.")
"1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"))))
(build-system gnu-build-system)
(inputs
- `(("fixesproto" ,fixesproto)
- ("pkg-config" ,pkg-config)))
+ `(("fixesproto" ,fixesproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -271,7 +276,7 @@ tracking.")
(base32
"0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -293,7 +298,7 @@ tracking.")
(base32
"02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -337,8 +342,9 @@ tracking.")
"0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontscale" ,mkfontscale)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontscale" ,mkfontscale)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -363,8 +369,9 @@ tracking.")
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
- ("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ ("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
;; install fonts into subdirectory of package output instead of
@@ -394,8 +401,9 @@ tracking.")
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
- ("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ ("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -426,7 +434,7 @@ tracking.")
(base32
"16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -450,8 +458,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -486,8 +495,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -518,8 +528,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -546,8 +557,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -575,8 +587,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -600,8 +613,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -624,8 +638,9 @@ tracking.")
"19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -654,8 +669,9 @@ tracking.")
(inputs
`(("mkfontdir" ,mkfontdir)
("font-util" ,font-util)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -682,8 +698,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -708,8 +725,9 @@ tracking.")
(inputs
`(("mkfontdir" ,mkfontdir)
("font-util" ,font-util)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
@@ -736,8 +754,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -761,8 +780,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -786,8 +806,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -809,7 +830,7 @@ tracking.")
(base32
"15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -833,8 +854,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mkfontdir" ,mkfontdir)
- ("bdftopcf" ,bdftopcf)
- ("pkg-config" ,pkg-config)))
+ ("bdftopcf" ,bdftopcf)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -857,8 +879,9 @@ tracking.")
"0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"))))
(build-system gnu-build-system)
(inputs
- `(("mkfontdir" ,mkfontdir)
- ("pkg-config" ,pkg-config)))
+ `(("mkfontdir" ,mkfontdir)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -880,7 +903,7 @@ tracking.")
(base32
"1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -902,7 +925,7 @@ tracking.")
(base32
"0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -925,8 +948,9 @@ tracking.")
"1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
(build-system gnu-build-system)
(inputs
- `(("libice" ,libice)
- ("pkg-config" ,pkg-config)))
+ `(("libice" ,libice)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -948,7 +972,7 @@ tracking.")
(base32
"1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -970,7 +994,7 @@ tracking.")
(base32
"0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1000,8 +1024,9 @@ tracking.")
`(("xextproto" ,xextproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("dmxproto" ,dmxproto)
- ("pkg-config" ,pkg-config)))
+ ("dmxproto" ,dmxproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1025,8 +1050,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
- ("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ ("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1051,8 +1077,9 @@ tracking.")
(inputs
`(("xtrans" ,xtrans)
("xproto" ,xproto)
- ("fontsproto" ,fontsproto)
- ("pkg-config" ,pkg-config)))
+ ("fontsproto" ,fontsproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1075,7 +1102,9 @@ tracking.")
"11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"))))
(build-system gnu-build-system)
(inputs
- `(("zlib" ,zlib) ("pkg-config" ,pkg-config)))
+ `(("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1097,7 +1126,7 @@ tracking.")
(base32
"16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1122,8 +1151,9 @@ tracking.")
(inputs
`(("xtrans" ,xtrans)
("util-linux" ,util-linux)
- ("libice" ,libice)
- ("pkg-config" ,pkg-config)))
+ ("libice" ,libice)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1149,8 +1179,9 @@ tracking.")
`(("xextproto" ,xextproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("windowswmproto" ,windowswmproto)
- ("pkg-config" ,pkg-config)))
+ ("windowswmproto" ,windowswmproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1176,8 +1207,9 @@ tracking.")
`(("xproto" ,xproto)
("libxfixes" ,libxfixes)
("libx11" ,libx11)
- ("compositeproto" ,compositeproto)
- ("pkg-config" ,pkg-config)))
+ ("compositeproto" ,compositeproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1200,7 +1232,9 @@ tracking.")
"13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1226,11 +1260,10 @@ tracking.")
`(("libx11" ,libx11)
("xproto" ,xproto)
("libxrender" ,libxrender)
- ("xproto" ,xproto)
- ("libx11" ,libx11)
("freetype" ,freetype)
- ("fontconfig" ,fontconfig)
- ("pkg-config" ,pkg-config)))
+ ("fontconfig" ,fontconfig)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1253,8 +1286,9 @@ tracking.")
"0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1279,8 +1313,9 @@ tracking.")
(inputs
`(("libxt" ,libxt)
("xproto" ,xproto)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1306,8 +1341,9 @@ tracking.")
`(("gettext" ,gnu-gettext)
("libxt" ,libxt)
("xproto" ,xproto)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1333,8 +1369,9 @@ tracking.")
`(("xproto" ,xproto)
("libxext" ,libxext)
("libx11" ,libx11)
- ("resourceproto" ,resourceproto)
- ("pkg-config" ,pkg-config)))
+ ("resourceproto" ,resourceproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1359,8 +1396,9 @@ tracking.")
(inputs
`(("libxext" ,libxext)
("libx11" ,libx11)
- ("scrnsaverproto" ,scrnsaverproto)
- ("pkg-config" ,pkg-config)))
+ ("scrnsaverproto" ,scrnsaverproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1385,8 +1423,9 @@ tracking.")
(inputs
`(("libx11" ,libx11)
("libxext" ,libxext)
- ("pkg-config" ,pkg-config)
("xf86dgaproto" ,xf86dgaproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1412,8 +1451,9 @@ tracking.")
(patches (list (search-patch "luit-posix.patch")))))
(build-system gnu-build-system)
(inputs
- `(("libfontenc" ,libfontenc)
- ("pkg-config" ,pkg-config)))
+ `(("libfontenc" ,libfontenc)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1436,7 +1476,8 @@ tracking.")
"1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1462,8 +1503,9 @@ tracking.")
`(("zlib" ,zlib)
("xproto" ,xproto)
("freetype" ,freetype)
- ("libfontenc" ,libfontenc)
- ("pkg-config" ,pkg-config)))
+ ("libfontenc" ,libfontenc)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1486,7 +1528,7 @@ tracking.")
(base32
"06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1508,7 +1550,7 @@ tracking.")
(base32
"0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1530,7 +1572,7 @@ tracking.")
(base32
"0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1552,7 +1594,7 @@ tracking.")
(base32
"0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1574,7 +1616,7 @@ tracking.")
(base32
"0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1596,7 +1638,7 @@ tracking.")
(base32
"0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1619,7 +1661,9 @@ tracking.")
"0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1643,8 +1687,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1668,8 +1713,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
- ("libxmu" ,libxmu)
- ("pkg-config" ,pkg-config)))
+ ("libxmu" ,libxmu)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1691,7 +1737,7 @@ tracking.")
(base32
"1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1713,7 +1759,7 @@ tracking.")
(base32
"0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1735,7 +1781,7 @@ tracking.")
(base32
"0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1761,8 +1807,9 @@ tracking.")
`(("libx11" ,libx11)
("libxft" ,libxft)
("libxmu" ,libxmu)
- ("libxrender" ,libxrender)
- ("pkg-config" ,pkg-config)))
+ ("libxrender" ,libxrender)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1788,8 +1835,9 @@ tracking.")
`(("libxmu" ,libxmu)
("libxext" ,libxext)
("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1814,8 +1862,9 @@ tracking.")
(inputs
`(("libx11" ,libx11)
("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("pkg-config" ,pkg-config)))
+ ("libxrender" ,libxrender)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1837,7 +1886,7 @@ tracking.")
(base32
"178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1859,7 +1908,7 @@ tracking.")
(base32
"0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
(build-system gnu-build-system)
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config) ("python" ,python-wrapper)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -1882,7 +1931,7 @@ tracking.")
(base32
"1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1905,8 +1954,9 @@ tracking.")
"03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1930,8 +1980,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxcursor" ,libxcursor)
- ("pkg-config" ,pkg-config)
("xcursorgen" ,xcursorgen)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-cursordir="
@@ -1960,8 +2011,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxcursor" ,libxcursor)
- ("libpng" ,libpng)
- ("pkg-config" ,pkg-config)))
+ ("libpng" ,libpng)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -1993,8 +2045,9 @@ tracking.")
("libxinerama" ,libxinerama)
("libxi" ,libxi)
("libxcomposite" ,libxcomposite)
- ("libdmx" ,libdmx)
- ("pkg-config" ,pkg-config)))
+ ("libdmx" ,libdmx)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2018,8 +2071,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("mesa" ,mesa)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2045,8 +2099,9 @@ tracking.")
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2068,7 +2123,7 @@ tracking.")
(base32
"06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2091,8 +2146,8 @@ tracking.")
"1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"))))
(build-system gnu-build-system)
;; FIXME: Add required input udev once it is available.
- (inputs `(("pkg-config" ,pkg-config)
- ("xorg-server" ,xorg-server)))
+ (inputs `(("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2114,8 +2169,8 @@ tracking.")
(base32
"1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"))))
(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)))
(arguments
`(#:configure-flags
(list (string-append "--with-sdkdir="
@@ -2142,8 +2197,8 @@ tracking.")
(base32
"1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2165,8 +2220,8 @@ tracking.")
(base32
"0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2191,8 +2246,8 @@ tracking.")
(inputs `(("libx11" ,libx11)
("libxi" ,libxi)
("mtdev" ,mtdev)
- ("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-sdkdir="
@@ -2222,8 +2277,8 @@ tracking.")
(base32
"16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"))))
(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)))
(arguments
`(#:configure-flags
(list(string-append "--with-xorg-conf-dir="
@@ -2250,8 +2305,8 @@ tracking.")
(base32
"01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2273,8 +2328,8 @@ tracking.")
(base32
"194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2296,8 +2351,8 @@ tracking.")
(base32
"1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2320,9 +2375,9 @@ tracking.")
"11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xxf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2344,8 +2399,8 @@ tracking.")
(base32
"0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2371,8 +2426,8 @@ tracking.")
(base32
"1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2444,9 +2499,9 @@ tracking.")
(base32
"0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2468,8 +2523,8 @@ tracking.")
(base32
"1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2493,8 +2548,9 @@ tracking.")
(build-system gnu-build-system)
(inputs `(("libdrm" ,libdrm)
("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2517,9 +2573,10 @@ tracking.")
"0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2542,9 +2599,9 @@ tracking.")
"03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2566,9 +2623,9 @@ tracking.")
(base32
"124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2590,8 +2647,8 @@ tracking.")
(base32
"1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2613,8 +2670,8 @@ tracking.")
(base32
"05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2640,9 +2697,10 @@ tracking.")
("libxext" ,libxext)
("libxvmc" ,libxvmc)
("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2665,9 +2723,9 @@ tracking.")
"1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2690,9 +2748,9 @@ tracking.")
"0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2714,8 +2772,8 @@ tracking.")
(base32
"01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2738,10 +2796,11 @@ tracking.")
"03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86dgaproto" ,xf86dgaproto)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2763,8 +2822,8 @@ tracking.")
(base32
"07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2786,8 +2845,8 @@ tracking.")
(base32
"04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2810,9 +2869,9 @@ tracking.")
"124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
("xf86driproto" ,xf86driproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2834,9 +2893,9 @@ tracking.")
(base32
"0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2858,9 +2917,9 @@ tracking.")
(base32
"02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2886,8 +2945,8 @@ tracking.")
(base32
"0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"))))
(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)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2910,9 +2969,9 @@ tracking.")
"0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)
- ("xorg-server" ,xorg-server)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -2934,9 +2993,9 @@ tracking.")
(base32
"0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)
- ("xf86dgaproto" ,xf86dgaproto)
+ (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3048,8 +3107,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxxf86vm" ,libxxf86vm)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3074,8 +3134,9 @@ tracking.")
(inputs
`(("libxmu" ,libxmu)
("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3097,7 +3158,7 @@ tracking.")
(base32
"0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3125,8 +3186,9 @@ tracking.")
("libxinerama" ,libxinerama)
("libxi" ,libxi)
("libx11" ,libx11)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3151,8 +3213,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3188,8 +3251,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxkbfile" ,libxkbfile)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3215,8 +3279,9 @@ tracking.")
`(("libxt" ,libxt)
("xproto" ,xproto)
("libxaw" ,libxaw)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3240,10 +3305,11 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("gettext" ,gnu-gettext)
- ("intltool" ,intltool)
("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xkbcomp-intermediate" ,xkbcomp-intermediate)))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3267,8 +3333,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3291,8 +3358,9 @@ tracking.")
"1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"))))
(build-system gnu-build-system)
(inputs
- `(("libxcb" ,libxcb)
- ("pkg-config" ,pkg-config)))
+ `(("libxcb" ,libxcb)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3315,8 +3383,9 @@ tracking.")
"1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"))))
(build-system gnu-build-system)
(inputs
- `(("libxcb" ,libxcb)
- ("pkg-config" ,pkg-config)))
+ `(("libxcb" ,libxcb)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3341,8 +3410,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3368,7 +3438,7 @@ tracking.")
(base32
"0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3393,8 +3463,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3418,8 +3489,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3445,8 +3517,9 @@ tracking.")
`(("libxrender" ,libxrender)
("libxrandr" ,libxrandr)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3470,8 +3543,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3494,8 +3568,9 @@ tracking.")
"0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"))))
(build-system gnu-build-system)
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3521,8 +3596,9 @@ tracking.")
`(("xproto" ,xproto)
("libxmu" ,libxmu)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3547,8 +3623,9 @@ tracking.")
(inputs
`(("libxmu" ,libxmu)
("libxcursor" ,libxcursor)
- ("xbitmaps" ,xbitmaps)
- ("pkg-config" ,pkg-config)))
+ ("xbitmaps" ,xbitmaps)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3570,7 +3647,7 @@ tracking.")
(base32
"19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"))))
(build-system gnu-build-system)
- (inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3595,8 +3672,9 @@ tracking.")
(inputs
`(("libxext" ,libxext)
("libxv" ,libxv)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3620,8 +3698,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
- ("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ ("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3645,8 +3724,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)
("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3670,8 +3750,9 @@ tracking.")
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3698,7 +3779,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("xextproto" ,xextproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3726,8 +3807,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxfixes" ,libxfixes)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3753,8 +3835,9 @@ tracking.")
`(("xextproto" ,xextproto)))
(inputs
`(("libxau" ,libxau)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3780,8 +3863,9 @@ tracking.")
`(("xineramaproto" ,xineramaproto)))
(inputs
`(("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3808,8 +3892,9 @@ tracking.")
`(("printproto" ,printproto)))
(inputs
`(("libx11" ,libx11)
- ("libxext" ,libxext)
- ("pkg-config" ,pkg-config)))
+ ("libxext" ,libxext)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3835,8 +3920,9 @@ tracking.")
`(("renderproto" ,renderproto)))
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3863,8 +3949,9 @@ tracking.")
(inputs
`(("libxi" ,libxi)
("libx11" ,libx11)
- ("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)))
+ ("inputproto" ,inputproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3891,8 +3978,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3916,7 +4004,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("mkfontscale" ,mkfontscale)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3941,7 +4029,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -3970,8 +4058,9 @@ tracking.")
(propagated-inputs
`(("xproto" ,xproto)))
(inputs
- `(("xtrans" ,xtrans)
- ("pkg-config" ,pkg-config)))
+ `(("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -3995,7 +4084,7 @@ tracking.")
(build-system gnu-build-system)
(propagated-inputs
`(("xproto" ,xproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -4021,8 +4110,9 @@ tracking.")
`(("fixesproto" ,fixesproto)))
(inputs
`(("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4051,8 +4141,9 @@ tracking.")
("xproto" ,xproto)))
(inputs
`(("zlib" ,zlib)
- ("xtrans" ,xtrans)
- ("pkg-config" ,pkg-config)))
+ ("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4079,8 +4170,9 @@ tracking.")
("libx11" ,libx11)
("libxext" ,libxext)))
(inputs
- `(("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4108,8 +4200,9 @@ tracking.")
(inputs
`(("libxrender" ,libxrender)
("xproto" ,xproto)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4136,8 +4229,9 @@ tracking.")
(inputs
`(("xproto" ,xproto)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ ("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4163,8 +4257,9 @@ tracking.")
`(("libxext" ,libxext)
("xf86vidmodeproto" ,xf86vidmodeproto)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4198,16 +4293,17 @@ tracking.")
("libxdamage" ,libxdamage)
("libxxf86vm" ,libxxf86vm)))
(inputs
- `(("bison" ,bison)
- ("dri2proto" ,dri2proto)
+ `(("dri2proto" ,dri2proto)
("expat" ,expat)
- ("flex" ,flex)
("libx11" ,libx11)
("libxfixes" ,libxfixes)
("libxml2" ,libxml2)
- ("makedepend" ,makedepend)
- ("pkg-config" ,pkg-config)
- ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
+ ("makedepend" ,makedepend)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("flex" ,flex)
+ ("bison" ,bison)
+ ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
(arguments
`(#:configure-flags
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
@@ -4251,8 +4347,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxdmcp" ,libxdmcp)))
(inputs
`(("xcb-proto" ,xcb-proto)
- ("libxslt" ,libxslt)
- ("pkg-config" ,pkg-config)
+ ("libxslt" ,libxslt)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(arguments
`(#:configure-flags '("--enable-xkb")))
@@ -4309,8 +4406,6 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxt" ,libxt)
("libxv" ,libxv)
("mesa" ,mesa)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
("recordproto" ,recordproto)
("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
@@ -4323,6 +4418,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("xkeyboard-config" ,xkeyboard-config)
("xtrans" ,xtrans)
("zlib" ,zlib)))
+ (native-inputs
+ `(("python" ,python-wrapper)
+ ("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-xkb-path="
@@ -4372,9 +4470,10 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxcb" ,libxcb)))
(inputs
`(("inputproto" ,inputproto)
- ("pkg-config" ,pkg-config)
("xextproto" ,xextproto)
("xtrans" ,xtrans)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4403,7 +4502,7 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxrender" ,libxrender)
("libxfixes" ,libxfixes)
("xproto" ,xproto)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
@@ -4431,8 +4530,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libice" ,libice)
("libsm" ,libsm)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4460,8 +4560,9 @@ emulation to complete hardware acceleration for modern GPUs.")
("libxpm" ,libxpm)
("libxt" ,libxt)))
(inputs
- `(("xproto" ,xproto)
- ("pkg-config" ,pkg-config)))
+ `(("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
@@ -4482,7 +4583,7 @@ emulation to complete hardware acceleration for modern GPUs.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util/")
(synopsis "Core XCB utility functions")
@@ -4515,8 +4616,9 @@ event: Some utilities that have little to do with events any more.")
(propagated-inputs
`(("libxcb" ,libxcb)))
(inputs
- `(("pkg-config" ,pkg-config)
- ("xcb-util" ,xcb-util)))
+ `(("xcb-util" ,xcb-util)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-image/")
(synopsis "XCB port of Xlib's XImage and XShmImage")
(description "The XCB util module provides a number of libraries which
@@ -4545,7 +4647,7 @@ image: Port of Xlib's XImage and XShmImage functions.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-keysyms/")
(synopsis "Standard X constants and conversion to/from keycodes")
@@ -4575,7 +4677,7 @@ keysyms: Standard X key constants and conversion to/from keycodes.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-renderutil/")
(synopsis "SConvenience functions for the Render extension")
@@ -4605,7 +4707,7 @@ renderutil: Convenience functions for the Render extension.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxcb" ,libxcb)))
- (inputs
+ (native-inputs
`(("m4" ,m4)
("pkg-config" ,pkg-config)))
(home-page "http://cgit.freedesktop.org/xcb/util-wm/")
@@ -4645,8 +4747,9 @@ icccm: Both client and window-manager helpers for ICCCM.")
("libxmu" ,libxmu)
("libxt" ,libxt)))
(inputs
- `(("libx11" ,libx11)
- ("pkg-config" ,pkg-config)))
+ `(("libx11" ,libx11)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System")
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index f505d05..c0fd8c5 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -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/")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-15 8:24 ` John Darrington
2013-12-15 8:39 ` [PATCH] gnu: gnupg: Fix " John Darrington
@ 2013-12-15 21:14 ` Ludovic Courtès
1 sibling, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-15 21:14 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <john@darrington.wattle.id.au> skribis:
> However, is --with-gpg-error-prefix really needed? By default the cross
> gcc will find the target libgpg-error in its search path, and not the
> native one, so I would guess this is OK.
>
>
> Without --with-gpg-error-prefix I get the following error when cross compiling:
>
> libtool: link: mips64el-linux-gnu-gcc -shared -fPIC -DPIC .libs/libgcrypt_la-visibility.o .libs/libgcrypt_la-misc.o .libs/libgcrypt_la-global.o .libs/libgcrypt_la-sexp.o .libs/libgcrypt_la-hwfeatures.o .libs/libgcrypt_la-stdmem.o .libs/libgcrypt_la-secmem.o .libs/libgcrypt_la-missing-string.o .libs/libgcrypt_la-module.o .libs/libgcrypt_la-fips.o .libs/libgcrypt_la-hmac256.o .libs/libgcrypt_la-ath.o -Wl,--whole-archive ../cipher/.libs/libcipher.a ../random/.libs/librandom.a ../mpi/.libs/libmpi.a ../compat/.libs/libcompat.a -Wl,--no-whole-archive -Wl,-rpath -Wl,/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib -Wl,-rpath -Wl,/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib -L/nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib /nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib/libgpg-error.so -O2 -Wl,--version-script=./libgcrypt.vers -Wl,-soname -Wl,libgcrypt.so.11 -o .libs/libgcrypt.so.11.8.2
> /nix/store/c3crv7mdmbc5sib7vznf0183n5xxa8kv-libgpg-error-1.12/lib/libgpg-error.so: could not read symbols: File in wrong format
> collect2: error: ld returned 1 exit status
> Makefile:493: recipe for target 'libgcrypt.la' failed
> make[2]: *** [libgcrypt.la] Error 1
Actually libgcrypt’s ‘configure’ reports this above:
--8<---------------cut here---------------start------------->8---
configure: WARNING:
***
*** The config script /nix/store/j47ldsz3p5mc3k5yp00lx1jwkan88k53-libgpg-error-1.12/bin/gpg-error-config was
*** built for x86_64-unknown-linux-gnu and thus may not match the
*** used host mips64el-unknown-linux-gnu.
*** You may want to use the configure option --with-gpg-error-prefix
*** to specify a matching config script.
***
--8<---------------cut here---------------end--------------->8---
So CROSS_LIBRARY_PATH and LIBRARY_PATH are correct (no confusion between
target and native libraries). However ‘configure’ uses the
‘gpg-error-config’ tool to determine the library’s location, and it gets
the run that of the native libgpg-error (because the target libgpg-error
isn’t in $PATH), which returns the location of the native libgpg-error.
So indeed, --with-gpg-error-prefix is needed.
Could you send the patch with just a comment above explaining that?
Thanks, and sorry for taking so long!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: openssl: Fix cross-compile issues.
2013-12-15 8:03 ` [PATCH] gnu: openssl: Fix " John Darrington
@ 2013-12-15 21:18 ` Ludovic Courtès
0 siblings, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-15 21:18 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> * gnu/packages/openssl.scm (openssl): Move perl from inputs to
> native-inputs.
> Replace reference to target bash with the native bash or target bash as
> appropriate.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: gnupg: Fix cross-compile issues.
2013-12-15 8:39 ` [PATCH] gnu: gnupg: Fix " John Darrington
@ 2013-12-15 21:24 ` Ludovic Courtès
0 siblings, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-15 21:24 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> From: John Darrington <john@darrington.wattle.id.au>
>
> * gnu/packages/gnupg.scm (libgpg-error): Add gcc as a native input,
> and set the CC_FOR_BUILD variable.
>
> * gnu/packages/gnupg.scm (libgcrypt): Add libgpg-error as a native input and
> set the --with-gpg-error-prefix configure option.
>
> * gnu/packages/gnupg.scm (libksba): Add libgpg-error as a native input and
> set the --with-gpg-error-prefix configure option.
Applied with comments, as noted in my previous message. Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: Move numerous "inputs" which should be "native-inputs".
2013-12-15 11:01 ` [PATCH] gnu: Move numerous " John Darrington
@ 2013-12-15 21:32 ` Ludovic Courtès
0 siblings, 0 replies; 24+ messages in thread
From: Ludovic Courtès @ 2013-12-15 21:32 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> * 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'.
Applied minus trailing whitespace (.dir-locals.el should set up a big
warning for you, doesn’t it?).
Note that this patch entails GLib/DBus/Python rebuilds, so expect Hydra
to be busy for some time...
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues.
2013-12-14 21:06 ` Ludovic Courtès
2013-12-15 8:24 ` John Darrington
@ 2014-01-07 10:32 ` John Darrington
1 sibling, 0 replies; 24+ messages in thread
From: John Darrington @ 2014-01-07 10:32 UTC (permalink / raw)
To: Ludovic Court?s; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2359 bytes --]
On Sat, Dec 14, 2013 at 10:06:13PM +0100, Ludovic Court??s wrote:
John Darrington <john@darrington.wattle.id.au> skribis:
> On Sat, Dec 14, 2013 at 07:19:03PM +0100, Ludovic Court??s wrote:
> John Darrington <john@darrington.wattle.id.au> skribis:
>
> > *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input,
> > and set the CC_FOR_BUILD variable.
>
> The implicit inputs when cross-compiling include both the cross-gcc and
> the native gcc (see build-system/gnu.scm.)
>
> AFAICS setting CC_FOR_BUILD=gcc should be enough (it uses ???cc??? by
> default.) Can you confirm.
>
> You are right. setting gcc as a native input seems to be unnecessary. Somewhat on
> a tangent:
> Would it not be a good idea to have CC_FOR_BUILD=gcc the default setting at least
> fot the gnu build-system.
Yeah, perhaps we could add that when cross building (we have only two
occurrences currently, but it may be needed quite often.)
Right. PSPP should have it, but does not currently.
> > *gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and
> > set the --with-gpg-error-prefix configure option.
>
> This is wrong: libgcrypt would end up linking against the native libgpg-error.
>
> I think you are mistaken. The purpose of --with-gpg-error-prefix= is to set the path
> of the library which it should be linked against. The issue is, that libgpg-error provides
> both a binary (which must be run at configure time) AND a library which has to be linked.
Oh indeed, I was unaware of that. So that explains why libgpg-error
must be passed both as a native and target input.
However, is --with-gpg-error-prefix really needed? By default the cross
gcc will find the target libgpg-error in its search path, and not the
native one, so I would guess this is OK.
That was not my experience. I will try it again, in case I missed something.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2014-01-07 10:32 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
2013-12-14 18:19 ` Ludovic Courtès
2013-12-14 19:02 ` John Darrington
2013-12-14 21:06 ` Ludovic Courtès
2013-12-15 8:24 ` John Darrington
2013-12-15 8:39 ` [PATCH] gnu: gnupg: Fix " John Darrington
2013-12-15 21:24 ` Ludovic Courtès
2013-12-15 21:14 ` [PATCH 2/5] gnu: gnupg: Fixed " Ludovic Courtès
2014-01-07 10:32 ` John Darrington
2013-12-14 17:43 ` [PATCH 3/5] gnu: tzdata: Added "source" as input John Darrington
2013-12-14 18:24 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 4/5] gnu: openssl: Fixed cross-compile issues John Darrington
2013-12-14 17:57 ` Ludovic Courtès
2013-12-14 18:02 ` John Darrington
2013-12-14 21:01 ` Ludovic Courtès
2013-12-15 8:03 ` [PATCH] gnu: openssl: Fix " John Darrington
2013-12-15 21:18 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs" John Darrington
2013-12-14 21:48 ` Ludovic Courtès
2013-12-15 10:36 ` John Darrington
2013-12-15 11:01 ` [PATCH] gnu: Move numerous " John Darrington
2013-12-15 21:32 ` Ludovic Courtès
2013-12-14 17:48 ` [PATCH 1/5] gnu: libxml2: Fixed cross-compilation Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.