M gnu/packages/glib.scm => gnu/packages/glib.scm +11 -0
@@ 160,6 160,17 @@ shared NFS home directories.")
;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a
;; file that gets compiled possibly before it has been fully generated.
#:parallel-tests? #f))
+
+ (native-search-paths
+ ;; This variable is not really "owned" by GLib, but several related
+ ;; packages refer to it: gobject-introspection's tools use it as a search
+ ;; path for .gir files, and it's also a search path for schemas produced
+ ;; by 'glib-compile-schemas'.
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (directories '("share")))))
+ (search-paths native-search-paths)
+
(synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
(description
"GLib provides data structure handling for C, portability wrappers,
M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -49
@@ 424,36 424,6 @@ some form of information without getting in the user's way.")
(base32
"13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0"))))
(build-system gnu-build-system)
- (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
- (alist-replace
- 'configure
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (let ((configure (assoc-ref %standard-phases 'configure)))
- (substitute* "libpeas-gtk/Makefile.in"
- (("--add-include-path")
- (string-append
- " --add-include-path=" (gir-directory inputs "atk")
- " --add-include-path=" (gir-directory inputs "gdk-pixbuf")
- " --add-include-path=" (gir-directory inputs "gtk+")
- " --add-include-path=" (gir-directory inputs "pango")
- " --add-include-path")))
- (substitute* "libpeas-gtk/Makefile.in"
- (("--includedir=\\$\\(top_builddir")
- (string-append
- " --includedir=" (gir-directory inputs "atk")
- " --includedir=" (gir-directory inputs "gdk-pixbuf")
- " --includedir=" (gir-directory inputs "gtk+")
- " --includedir=" (gir-directory inputs "pango")
- " --includedir=$(top_builddir")))
- (apply configure args)))
- %standard-phases)))
(inputs
`(("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf)
@@ 605,28 575,10 @@ dealing with different structured file formats.")
"071959yjb2i1bja7ciy4bmpnd6fn2is9jjqsvvvnsqwl69j9n128"))))
(build-system gnu-build-system)
(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-cons-before
'configure 'augment-gir-search-path
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* (find-files "." "Makefile\\.in")
- (("INTROSPECTION_SCANNER_ARGS = ")
- (string-append "INTROSPECTION_SCANNER_ARGS = "
- "--add-include-path="
- (gir-directory inputs "gdk-pixbuf")
- " "))
- (("INTROSPECTION_COMPILER_ARGS = ")
- (string-append "INTROSPECTION_COMPILER_ARGS = "
- "--includedir="
- (gir-directory inputs "gdk-pixbuf")
- " ")))
-
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
;; gdk-pixbuf's prefix. Work around that.
M gnu/packages/gtk.scm => gnu/packages/gtk.scm +3 -33
@@ 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)))))