diff options
| author |  Paul Buxton <paubuxton.mail@googlemail.com> | 2019-09-22 15:01:52 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-23 13:38:57 -0700 |
| commit | c1aa686f9c24c8543e95bf3a77a0f111b8b98dc9 (patch) | |
| tree | de120b115df95fb96d945581aca41cd8c760263c /scripts/docker/trusty-qt512 | |
| parent | 4b391c448dadb33b01505b7356108a02cf0a80d4 (diff) | |
| download | subsurface-c1aa686f9c24c8543e95bf3a77a0f111b8b98dc9.tar.gz | |
AppImage: Fix path of machine-id in dbus library
When building dbus within the appimage, cmake picks up the installation
path of various files dbus uses through the GNUInstallDirs package,
however this doesn't work under the appimage build.
So we replace the variable with the normal location of this file.
Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/trusty-qt512')
| -rw-r--r-- | scripts/docker/trusty-qt512/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile index 0c1914a03..b943461f5 100644 --- a/scripts/docker/trusty-qt512/Dockerfile +++ b/scripts/docker/trusty-qt512/Dockerfile @@ -55,7 +55,8 @@ RUN rm -rf qtwebkit ADD dbus-1.12.16.tar.gz . RUN mkdir dbus-1.12.16/build && \ cd dbus-1.12.16/build && \ - cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \ + sed -inline 's/${CMAKE_INSTALL_FULL_LOCALSTATEDIR}\/lib\/dbus\/machine-id/\/var\/lib\/dbus\/machine-id/' ../cmake/CMakeLists.txt && \ + cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \ make install && \ ldconfig |