snap: Use SNAPCRAFT_ARCH_TRIPLET for pulseaudio library workaround (#188

) Signed-off-by: 林博仁(Buo-ren Lin) <[email protected]>
mikf · Mar 13, 2019 · d398b1d · d398b1d
1 parent 6dae6be
commit d398b1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 64 deletions.
diff --git a/snap/local/launchers/gallery-dl-launch b/snap/local/launchers/gallery-dl-launch
@@ -7,14 +7,6 @@ set \
 	-o nounset \
 	-o pipefail
 
-if ! test -v SNAP_ARCH_TRIPLET; then
-	printf 'Error: SNAP_ARCH_TRIPLET not set, this launcher requires workaround-snap-arch-triplet-launch launcher to work.\n' >&2
-	exit 1
-fi
-
-# Satisfy FFmpeg's usr/lib/ARCH/pulseaudio/libpulsecommon-11.1.so dependency
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}":"$SNAP"/usr/lib/"${SNAP_ARCH_TRIPLET}"/pulseaudio
-
 # Use user's real home directory for canonical configuration path access
 # FIXME: Waiting for Snap Store assertion
 declare REALHOME="$(

diff --git a/snap/local/launchers/workaround-snap-arch-triplet-launch b/snap/local/launchers/workaround-snap-arch-triplet-launch
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -83,10 +83,13 @@ apps:
   gallery-dl:
     adapter: full
     command-chain:
-    - bin/workaround-snap-arch-triplet-launch
     - bin/gallery-dl-launch
     command: bin/gallery-dl
     environment:
       LANG: C.UTF-8
       LC_ALL: C.UTF-8
+
+      # Satisfy FFmpeg's libpulsecommon dependency
+      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
+
       HOME: $SNAP_USER_COMMON