Revert "gnu: gobject-introspection: Update to 1.42.0 and add new patch."
This reverts commit 66717243d0
. Several
packages fail to build with the new version.
This commit is contained in:
parent
c7e553a309
commit
6c2cf86edb
|
@ -197,18 +197,17 @@ dynamic loading, and an object system.")
|
||||||
(define gobject-introspection
|
(define gobject-introspection
|
||||||
(package
|
(package
|
||||||
(name "gobject-introspection")
|
(name "gobject-introspection")
|
||||||
(version "1.42.0")
|
(version "1.38.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
|
(uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
|
||||||
"gobject-introspection/" (version-major+minor version)
|
"gobject-introspection/"
|
||||||
"/gobject-introspection-" version ".tar.xz"))
|
(substring version 0 (string-rindex version #\.))
|
||||||
|
"/gobject-introspection-"
|
||||||
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv"))
|
(base32 "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"))
|
||||||
(patches (list
|
(patches (list (search-patch "gobject-introspection-cc.patch")))))
|
||||||
(search-patch "gobject-introspection-cc.patch")
|
|
||||||
(search-patch
|
|
||||||
"gobject-introspection-absolute-shlib-path.patch")))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("bison" ,bison)
|
`(("bison" ,bison)
|
||||||
|
@ -229,10 +228,7 @@ dynamic loading, and an object system.")
|
||||||
(directories '("lib/girepository-1.0")))))
|
(directories '("lib/girepository-1.0")))))
|
||||||
(search-paths native-search-paths)
|
(search-paths native-search-paths)
|
||||||
(arguments
|
(arguments
|
||||||
`(;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes
|
`(#:phases
|
||||||
;; some tests to fail.
|
|
||||||
#:tests? #f
|
|
||||||
#:phases
|
|
||||||
(alist-cons-before
|
(alist-cons-before
|
||||||
'configure 'patch-paths
|
'configure 'patch-paths
|
||||||
(lambda _
|
(lambda _
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
# Names of libraries included in typelib files are opened by dlopen. Here we
|
|
||||||
# add the full path.
|
|
||||||
#
|
|
||||||
# This patch was provided by Luca Bruno <lucabru@src.gnome.org> for
|
|
||||||
# 'gobject-introspection' 1.40.0 in Nix.
|
|
||||||
--- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200
|
|
||||||
+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200
|
|
||||||
@@ -110,17 +110,11 @@
|
|
||||||
if dlname is None:
|
|
||||||
return None
|
|
||||||
|
|
||||||
- # Darwin uses absolute paths where possible; since the libtool files never
|
|
||||||
- # contain absolute paths, use the libdir field
|
|
||||||
- if platform.system() == 'Darwin':
|
|
||||||
- dlbasename = os.path.basename(dlname)
|
|
||||||
- libdir = _extract_libdir_field(la_file)
|
|
||||||
- if libdir is None:
|
|
||||||
- return dlbasename
|
|
||||||
- return libdir + '/' + dlbasename
|
|
||||||
- # From the comments in extract_libtool(), older libtools had
|
|
||||||
- # a path rather than the raw dlname
|
|
||||||
- return os.path.basename(dlname)
|
|
||||||
+ dlbasename = os.path.basename(dlname)
|
|
||||||
+ libdir = _extract_libdir_field(la_file)
|
|
||||||
+ if libdir is None:
|
|
||||||
+ return dlbasename
|
|
||||||
+ return libdir + '/' + dlbasename
|
|
||||||
|
|
||||||
|
|
||||||
def extract_libtool(la_file):
|
|
Loading…
Reference in New Issue