diff options
| author |  Keshav Bhatt <keshavnrj@gmail.com> | 2022-04-08 23:06:18 +0530 |
|---|---|---|
| committer | Keshav Bhatt <keshavnrj@gmail.com> | 2022-04-08 23:06:18 +0530 |
| commit | 8962c8bbd5ff8213be7f440e559d5e66475dcf24 (patch) | |
| tree | fd6f467bfb3b1902ed8d664e230b72df8c3f5396 | |
| parent | 4a88bfb96ff405a999073cc15d9180462b9f2734 (diff) | |
| download | whatsie-8962c8bbd5ff8213be7f440e559d5e66475dcf24.tar.gz whatsie-8962c8bbd5ff8213be7f440e559d5e66475dcf24.zip | |
build(snap): use SNAPCRAFT_ARCH_TRIPLET
| -rw-r--r-- | snap/snapcraft.yaml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ef7919e..18ce536 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -52,8 +52,8 @@ apps: - network - wayland - hardware-observe # to assist geoclue & qtpositioning - - network-observe # to assistgeoclue & qtpositioning - - network-bind # to assistgeoclue & qtpositioning + - network-observe # to assist geoclue & qtpositioning + - network-bind # to assist geoclue & qtpositioning plugs: gsettings: @@ -87,17 +87,9 @@ parts: QT_BASE_DIR=/opt/qt515 export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH - - if [[ $(uname -m) == "x86_64" ]]; then - export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - else - export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/i386-linux-gnu:$QT_BASE_DIR/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - fi - + export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/$SNAPCRAFT_ARCH_TRIPLET:$QT_BASE_DIR/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} - which qmake - mkdir -p ${SNAPCRAFT_PART_INSTALL}/usr/bin/ /opt/qt515/bin/qmake src |