diff options
| author | Kyle Fazzari <github@status.e4ward.com> | 2017-10-18 20:16:41 +0300 |
|---|---|---|
| committer | Daniel Hansson <daniel@techandme.se> | 2017-10-18 20:16:41 +0300 |
| commit | 86f4cec9767b4e48fac8f784596b7320bd1acca3 (patch) | |
| tree | 9ae865f6e05664da35a1752cf8c1bc4d2a32ede1 | |
| parent | 191a06be4882105fc8a308100477ed750ca9bf53 (diff) | |
snap: utilize login keyring (#207)
This utilizes the `password-manager-service` interface introduced in
snapd v2.27.
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| -rw-r--r-- | linux/snap/snapcraft.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linux/snap/snapcraft.yaml b/linux/snap/snapcraft.yaml index 8b91854..4eae686 100644 --- a/linux/snap/snapcraft.yaml +++ b/linux/snap/snapcraft.yaml @@ -13,6 +13,7 @@ parts: client: plugin: cmake source: ../ + source-type: git source-subdir: client build-packages: - g++ @@ -22,12 +23,19 @@ parts: - pkg-config - qt5keychain-dev - qttools5-dev-tools + stage-packages: + # qtkeychain requires these libs at runtime to support keyrings + - libsecret-1-0 + - libgnome-keyring0 configflags: - -DCMAKE_BUILD_TYPE=Release - -DOEM_THEME_DIR=$SNAPCRAFT_PART_INSTALL/../src/nextcloudtheme - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_LIBDIR=/usr/lib - -DSYSCONF_INSTALL_DIR=/etc + install: | + # Replace icon with the correct path in the snap + sed -ri "s|(^Icon=).*$|\1\${SNAP}/meta/gui/icon.svg|" "$SNAPCRAFT_PART_INSTALL/usr/share/applications/nextcloud.desktop" after: - desktop-qt5 @@ -57,6 +65,7 @@ apps: - network - network-bind - network-manager + - password-manager-service cmd: aliases: |