From 45043bcdf5b383af573375300f2ba6b28210e3c6 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 9 Jun 2022 12:53:32 -0700 Subject: [PATCH] py-xdot requires explicit dependency on harfbuzz (#30968) --- var/spack/repos/builtin/packages/py-xdot/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index 4549f80819..e7197bf731 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -27,6 +27,7 @@ class PyXdot(PythonPackage): depends_on('py-pygobject', type=('build', 'run')) depends_on('py-pycairo', type=('build', 'run')) depends_on('pango', type=('build', 'run')) + depends_on('harfbuzz', type=('build', 'run')) depends_on('atk', type=('build', 'run')) depends_on('gdk-pixbuf', type=('build', 'run')) depends_on('gtkplus', type=('build', 'run')) @@ -35,11 +36,12 @@ class PyXdot(PythonPackage): @run_after('install') def post_install(self): spec = self.spec - repo_paths = '%s:%s:%s:%s' % ( + repo_paths = '%s:%s:%s:%s:%s' % ( join_path(spec['pango'].prefix.lib, 'girepository-1.0'), join_path(spec['atk'].prefix.lib, 'girepository-1.0'), join_path(spec['gdk-pixbuf'].prefix.lib, 'girepository-1.0'), - join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0')) + join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0'), + join_path(spec['harfbuzz'].prefix.lib, 'girepository-1.0')) dst = join_path(python_platlib, 'xdot', '__init__.py') filter_file("import sys", "import sys\nimport os\nos.environ['GI_TYPELIB_PATH']" + @@ -50,6 +52,9 @@ def post_install(self): def setup_run_environment(self, env): spec = self.spec + env.prepend_path('GI_TYPELIB_PATH', + join_path(spec['harfbuzz'].prefix.lib, + 'girepository-1.0')) env.prepend_path('GI_TYPELIB_PATH', join_path(spec['pango'].prefix.lib, 'girepository-1.0'))