[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: Revert "gnu: gobject-introspection: Update to 1.64.1."
From: |
guix-commits |
Subject: |
04/08: Revert "gnu: gobject-introspection: Update to 1.64.1." |
Date: |
Tue, 1 Dec 2020 17:26:29 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 5b580c0a2873010a3ae02b11bdd46a736f52bc8c
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Dec 1 23:05:31 2020 +0100
Revert "gnu: gobject-introspection: Update to 1.64.1."
This reverts commit 0382e6a4e633d8e95954754475d0887a661c670b.
---
gnu/packages/glib.scm | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b9625ed..ce132f8 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -428,7 +428,7 @@ dynamic loading, and an object system.")
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.64.1")
+ (version "1.62.0")
(source
(origin
(method url-fetch)
@@ -437,7 +437,7 @@ dynamic loading, and an object system.")
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"))
+ (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"))
(patches
(search-patches
"gobject-introspection-cc.patch"
@@ -445,17 +445,25 @@ dynamic loading, and an object system.")
"gobject-introspection-absolute-shlib-path.patch"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
+ `(#: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)))))
(native-inputs
- `(("bison" ,bison)
- ("flex" ,flex)
- ("glib" ,glib "bin")
+ `(("glib" ,glib "bin")
("pkg-config" ,pkg-config)))
(inputs
- `(("python" ,python-wrapper)))
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("glib" ,glib)
+ ("python" ,python-wrapper)
+ ("zlib" ,zlib)))
(propagated-inputs
- `(("glib" ,glib)
- ("libffi" ,libffi)))
+ `(("libffi" ,libffi)))
(native-search-paths
(list
(search-path-specification
- branch master updated (f4450e8 -> 04b8367), guix-commits, 2020/12/01
- 05/08: Revert "gnu: yelp-tools: De-propagate some inputs.", guix-commits, 2020/12/01
- 08/08: Revert "gnu: python-packaging: Update to 20.4.", guix-commits, 2020/12/01
- 06/08: Revert "gnu: yelp-xsl: Enable documentation.", guix-commits, 2020/12/01
- 03/08: Revert "gnu: pixman: Update to 0.40.0.", guix-commits, 2020/12/01
- 07/08: Revert "gnu: yelp-xsl: Update to 3.36.0.", guix-commits, 2020/12/01
- 04/08: Revert "gnu: gobject-introspection: Update to 1.64.1.",
guix-commits <=
- 02/08: Revert "gnu: pixman: Enable some features.", guix-commits, 2020/12/01
- 01/08: Revert "gnu: openjpeg: Enable tests.", guix-commits, 2020/12/01