[neon/snap-packaging/kf6-core-sdk] /: Override kdoctools buildenv to use craft stage usr bin PATH.
Scarlett Moore
null at kde.org
Mon Jun 10 12:08:07 BST 2024
Git commit e01cbe02fc9d8f3d47421890dc2ff140ac6f3c9b by Scarlett Moore.
Committed on 10/06/2024 at 11:07.
Pushed by scarlettmoore into branch 'master'.
Override kdoctools buildenv to use craft stage usr bin PATH.
M +6 -1 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/e01cbe02fc9d8f3d47421890dc2ff140ac6f3c9b
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4c4fb75..9e868f8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -683,7 +683,12 @@ parts:
plugin: cmake
cmake-generator: Ninja
cmake-parameters: *cmakeparameters
- build-environment: *buildenvironment
+ build-environment:
+ - PATH: $CRAFT_STAGE/usr/bin:/snap/kde-qt6-core22-sdk/current/usr/bin${PATH:+:$PATH}
+ - PKG_CONFIG_PATH: /snap/kde-qt6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+ - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+ - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+ - LD_LIBRARY_PATH: "/snap/kde-qt6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core22-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
kconfigwidgets:
after:
- kcolorscheme
More information about the Neon-commits
mailing list