From c1aa686f9c24c8543e95bf3a77a0f111b8b98dc9 Mon Sep 17 00:00:00 2001 From: Paul Buxton Date: Sun, 22 Sep 2019 15:01:52 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- scripts/docker/trusty-qt512/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/docker/trusty-qt512') 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 -- cgit v1.2.3-70-g09d2