diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6856a9a8..2f3842c1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -187,10 +187,6 @@ parts: build-snaps: - cmake - snap-specifics: - source: snap/local - plugin: dump - plugs: shared-memory: private: true diff --git a/snap/snapcraft21.yaml b/snap/snapcraft21.yaml index c3989132..b4d37a88 100644 --- a/snap/snapcraft21.yaml +++ b/snap/snapcraft21.yaml @@ -187,19 +187,9 @@ parts: build-snaps: - cmake - snap-specifics: - source: snap/local - plugin: dump - - snapcraft-preload: - source: https://github.com/sergiusens/snapcraft-preload.git - plugin: cmake - cmake-parameters: - - -DCMAKE_INSTALL_PREFIX=/ - build-packages: - - on amd64: - - gcc-multilib - - g++-multilib +plugs: + shared-memory: + private: true apps: opendronemap: @@ -208,7 +198,8 @@ apps: - bin/snapcraft-preload # Fixes multiprocessing python module environment: # Ensure libraries are found - LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack:$LD_LIBRARY_PATH + LD_LIBRARY_PATH: $SNAP/odm/SuperBuild/install/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack + PYTHONPATH: $SNAP/odm/SuperBuild/install:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3/dist-packages/:$SNAP/usr/lib/python3.8 plugs: - home - network