summaryrefslogtreecommitdiff
path: root/gnu/packages/gtk.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-05-06 23:10:11 +0200
committerLudovic Courtès <ludo@gnu.org>2014-05-06 23:10:11 +0200
commitce2df078d7b8e8d44b831270421513bd04429866 (patch)
tree858fa7ef7b1d304096d9329b9f049a72c1df183c /gnu/packages/gtk.scm
parent141aed808701351685de9d92532392384d730b37 (diff)
downloadpatches-ce2df078d7b8e8d44b831270421513bd04429866.tar
patches-ce2df078d7b8e8d44b831270421513bd04429866.tar.gz
gnu: Make $XDG_DATA_DIRS a search path variable for GLib.
* gnu/packages/glib.scm (glib): Add 'native-search-paths' and 'search-paths' fields. * gnu/packages/gnome.scm (libpeas): Remove 'arguments' field. (librsvg)[arguments]: Remove #:modules and #:imported-modules. Remove settings of INTROSPECTION_SCANNER_ARGS and INTROSPECTION_COMPILER_ARGS in makefiles. * gnu/packages/gtk.scm (gtk+): Likewise.
Diffstat (limited to 'gnu/packages/gtk.scm')
-rw-r--r--gnu/packages/gtk.scm36
1 files changed, 3 insertions, 33 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index cfe3dac476..7600103da3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -375,13 +375,7 @@ application suites.")
("python-wrapper" ,python-wrapper)
("xorg-server" ,xorg-server)))
(arguments
- `(#:modules ((guix build gnome)
- (guix build gnu-build-system)
- (guix build utils))
- #:imported-modules ((guix build gnome)
- (guix build gnu-build-system)
- (guix build utils))
- #:phases
+ `(#:phases
(alist-replace
'configure
(lambda* (#:key inputs #:allow-other-keys #:rest args)
@@ -392,32 +386,8 @@ application suites.")
;; directory.
;; See the manual page for dbus-uuidgen to correct this issue.
(substitute* "testsuite/Makefile.in"
- (("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk"))
-
- ;; We need to tell GIR where it can find some of the required .gir
- ;; files.
- (substitute* "gdk/Makefile.in"
- (("--add-include-path=../gdk")
- (string-append
- "--add-include-path=../gdk"
- " --add-include-path=" (gir-directory inputs "gdk-pixbuf")
- " --add-include-path=" (gir-directory inputs "pango")))
- (("--includedir=\\.")
- (string-append "--includedir=."
- " --includedir=" (gir-directory inputs "gdk-pixbuf")
- " --includedir=" (gir-directory inputs "pango"))))
-
- (substitute* "gtk/Makefile.in"
- (("--add-include-path=../gdk")
- (string-append "--add-include-path=../gdk"
- " --add-include-path=" (gir-directory inputs "atk")
- " --add-include-path=" (gir-directory inputs "gdk-pixbuf")
- " --add-include-path=" (gir-directory inputs "pango")))
- (("--includedir=../gdk")
- (string-append "--includedir=../gdk"
- " --includedir=" (gir-directory inputs "atk")
- " --includedir=" (gir-directory inputs "gdk-pixbuf")
- " --includedir=" (gir-directory inputs "pango"))))
+ (("SUBDIRS = gdk gtk a11y css reftests")
+ "SUBDIRS = gdk"))
(apply configure args)))
%standard-phases)))))