[neon/snap-packaging/kf6-core-sdk/work.core24] /: Fix build environment

[Scarlett Moore]

Git commit 65f844090ccfccf1b744e9684bf1638d5e958066 by Scarlett Moore.
Committed on 01/05/2025 at 13:31.
Pushed by scarlettmoore into branch 'work.core24'.

Fix build environment

M  +12   -11   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/65f844090ccfccf1b744e9684bf1638d5e958066

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 68b9f00..3492e15 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -52,6 +52,12 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+    build-environment: &buildenvironment
+      - PATH: /snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
+      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-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-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+      - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:/snap/kde-qt6-core24-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}"
   glib:
     after: [ libffi, meson-deps ]
     source: https://gitlab.gnome.org/GNOME/glib.git
@@ -62,6 +68,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+    build-environment: *buildenvironment
     override-build: |
       set -eux
       craftctl default
@@ -80,6 +87,7 @@ parts:
     source: https://github.com/ninja-build/ninja.git
     source-tag: 'v1.11.1'
     source-depth: 1
+    build-environment: *buildenvironment
     override-build: |
       rm -rf build
       rm -f ninja
@@ -101,6 +109,7 @@ parts:
     source: https://github.com/mesonbuild/meson.git
     source-tag: '1.2.3'
     source-depth: 1
+    build-environment: *buildenvironment
     override-build: |
       python3 -m pip install --break-system-packages .
       mkdir -p $CRAFT_PART_INSTALL/usr/lib/python3/dist-packages
@@ -153,6 +162,7 @@ parts:
     source: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git
     source-tag: '42.0'
     source-depth: 1
+    build-environment: *buildenvironment
     build-packages:
       - libgirepository-1.0-dev
     stage-packages:
@@ -224,11 +234,7 @@ parts:
       - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
       - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/usr"
     build-environment: &buildenvironment
-      - PATH: /snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
-      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-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-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
-      - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
-      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:/snap/kde-qt6-core24-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}"
+
     stage-packages:
       - python3
   plasma-wayland-protocols:
@@ -787,12 +793,7 @@ parts:
     plugin: cmake
     cmake-generator: Ninja
     cmake-parameters: *cmakeparameters
-    build-environment:
-      - PATH: $CRAFT_STAGE/usr/bin:/snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
-      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-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-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
-      - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
-      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-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}"
+    build-environment: *buildenvironment
   kconfigwidgets:
     after:
       - kcolorscheme