diff --git a/recipes/xkbcommon/all/conanfile.py b/recipes/xkbcommon/all/conanfile.py index 069c77a267a910..1227acb447c354 100644 --- a/recipes/xkbcommon/all/conanfile.py +++ b/recipes/xkbcommon/all/conanfile.py @@ -34,7 +34,7 @@ class XkbcommonConan(ConanFile): "xkbregistry": True, } - generators = "PkgConfigDeps", "VirtualBuildEnv", "VirtualRunEnv" + generators = "PkgConfigDeps", "VirtualBuildEnv" @property def _has_xkbregistry_option(self): @@ -68,7 +68,7 @@ def build_requirements(self): self.tool_requires("meson/0.63.1") self.tool_requires("bison/3.7.6") self.tool_requires("pkgconf/1.7.4") - if self.options.get_safe("with_wayland"): + if hasattr(self, "settings_build") and self.options.get_safe("with_wayland"): self.tool_requires("wayland/1.21.0") def layout(self): @@ -153,7 +153,6 @@ def package_info(self): if Version(self.version) >= "1.0.0": bindir = os.path.join(self.package_folder, "bin") self.buildenv_info.prepend_path("PATH", bindir) - self.runenv_info.prepend_path("PATH", bindir) self.output.info(f"Appending PATH environment variable: {bindir}") self.env_info.PATH.append(bindir) diff --git a/recipes/xkbcommon/all/test_package/conanfile.py b/recipes/xkbcommon/all/test_package/conanfile.py index eecad0444878e9..622d31592b6f43 100644 --- a/recipes/xkbcommon/all/test_package/conanfile.py +++ b/recipes/xkbcommon/all/test_package/conanfile.py @@ -8,7 +8,7 @@ class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "CMakeToolchain", "CMakeDeps", "VirtualBuildEnv", "VirtualRunEnv" + generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv" def requirements(self): self.requires(self.tested_reference_str)