>From d3fe71f442d71dc4e4ee1479a62043e86d8e2084 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:27:48 -0400 Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>: Remove all phases. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex, glib and zlib. [propagated-inputs]: Add glib. --- gnu/packages/glib.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 549145e799..cda8a97d5f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -340,7 +340,7 @@ threads, dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches "gobject-introspection-cc.patch" @@ -348,25 +348,17 @@ threads, dynamic loading, and an object system.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- 2.28.0