From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:58:26 -0400 Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes. * gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes. --- gnu/packages/glib.scm | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b15c75a740..549145e799 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.") (package (name "gobject-introspection") (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.") (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths - (list (search-path-specification - (variable "GI_TYPELIB_PATH") - (files '("lib/girepository-1.0"))))) + (list + (search-path-specification + (variable "GI_TYPELIB_PATH") + (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description "GObject introspection is a middleware layer between C libraries (using @@ -379,7 +380,7 @@ GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ + (home-page "https://wiki.gnome.org/GObjectIntrospection") (license license:gpl2+))) (define intltool -- 2.28.0