From 2af6c57afa61f0a1c23fe37bac9453bdd4efc796 Mon Sep 17 00:00:00 2001 From: Jordan Galby <67924449+Jordan474@users.noreply.github.com> Date: Mon, 6 Sep 2021 12:18:13 +0200 Subject: py-pyqt5: don't install files into qt5 install prefix (#25657) By default, py-pyqt5 installs qt designer and qml plugins into qt5's install `/plugins`. Don't do that. --- var/spack/repos/builtin/packages/py-pyqt5/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py index 86493358e9..5556e76576 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py @@ -37,6 +37,8 @@ class PyPyqt5(SIPPackage): args = [ '--pyuic5-interpreter', self.spec['python'].command.path, '--sipdir', self.prefix.share.sip.PyQt5, + '--designer-plugindir', self.prefix.plugins.designer, + '--qml-plugindir', self.prefix.plugins.PyQt5, '--stubsdir', join_path( self.prefix, self.spec['python'].package.site_packages_dir, @@ -46,3 +48,6 @@ class PyPyqt5(SIPPackage): args.extend(['--qsci-api', '--qsci-api-destdir', self.prefix.share.qsci]) return args + + def setup_run_environment(self, env): + env.prepend_path('QT_PLUGIN_PATH', self.prefix.plugins) -- cgit v1.2.3-70-g09d2