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

gnu: gobject-introspection is usually meant to be a native input. 

* gnu/packages/gtk.scm (atk, pango, gdk-pixbuf, gtk+): Move
  gobject-introspection to 'native-inputs' since it's only used at build
  time.
* gnu/packages/gnome.scm (libpeas): Move pkg-config,
  gobject-introspection, and intltool to 'native-inputs'.
This commit is contained in:
Ludovic Courtès 2014-05-06 22:40:33 +02:00
parent 63016e7cd0
commit 141aed8087
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/gnome.scm
View File

@ -458,11 +458,12 @@ some form of information without getting in the user's way.")
`(("atk" ,atk) `(("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib) ("glib" ,glib)
("gobject-introspection" ,gobject-introspection)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("intltool" ,intltool) ("pango" ,pango)))
("pango" ,pango) (native-inputs
("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)))
(home-page "https://wiki.gnome.org/Libpeas") (home-page "https://wiki.gnome.org/Libpeas")
(synopsis "GObject plugin system") (synopsis "GObject plugin system")
(description (description

23
gnu/packages/gtk.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,9 +53,10 @@
(base32 (base32
"1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3")))) "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)))
("gobject-introspection" ,gobject-introspection))) (native-inputs
(native-inputs `(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(synopsis "GNOME accessibility toolkit") (synopsis "GNOME accessibility toolkit")
(description (description
"ATK provides the set of accessibility interfaces that are implemented "ATK provides the set of accessibility interfaces that are implemented
@ -156,10 +157,10 @@ affine transformation (scale, rotation, shear, etc.)")
`(("cairo" ,cairo) `(("cairo" ,cairo)
("harfbuzz" ,harfbuzz))) ("harfbuzz" ,harfbuzz)))
(inputs (inputs
`(("gobject-introspection" ,gobject-introspection) `(("zlib" ,zlib)))
("zlib" ,zlib)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(synopsis "GNOME text and font handling library") (synopsis "GNOME text and font handling library")
(description (description
"Pango is the core text and font handling library used in GNOME "Pango is the core text and font handling library used in GNOME
@ -236,12 +237,12 @@ printing and other features typical of a source code editor.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("gobject-introspection", gobject-introspection)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff))) ("libtiff" ,libtiff)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("gobject-introspection", gobject-introspection))) ; g-ir-compiler, etc.
(synopsis "GNOME image loading and manipulation library") (synopsis "GNOME image loading and manipulation library")
(description (description
"GdkPixbuf is a library for image loading and manipulation developed "GdkPixbuf is a library for image loading and manipulation developed
@ -366,11 +367,11 @@ application suites.")
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("pango" ,pango))) ("pango" ,pango)))
(inputs (inputs
`(("gobject-introspection" ,gobject-introspection) `(("libxml2" ,libxml2)))
("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(arguments (arguments