diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-07-13 11:43:03 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-07-13 18:54:18 +0100 |
| commit | 145fed2a2b499e840c22c0165b6c2d062dd2ce88 (patch) | |
| tree | b92255736a8f9ef30a92e8c1d991fd09cbafae99 | |
| parent | 26a7ff6e10652270a4ef6ef9a08392b31ff86f40 (diff) | |
gnu: gobject-introspection: Remove hardcoded store from patch.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Use
the NIX_STORE environment variable, rather than hardcoding the store
directory.
| -rw-r--r-- | gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 3c0bb1c6cf..956fa617c3 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -61,12 +61,14 @@ parser.add_option_group(group) --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) +def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape('/gnu/store') ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) + pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' + return re.compile(pattern % (store_dir, re.escape(library_name))) + @@ -109,14 +111,15 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): - for library, pattern in patterns.items(): - m = pattern.match(word) + for library, (pattern, guix_pattern) in patterns.items(): -+ if line.find('/gnu/store') != -1: ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: + m = guix_pattern.match(word) + else: + m = pattern.match(word) |