From aa36ef046c95a7c98ff4b725fb4861e6d3f6266b Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Sun, 1 Mar 2026 14:41:33 -0500 Subject: [PATCH] fix(dbus): use relative CMake install dirs so dbus-1.pc exports valid include/lib paths --- steps-guix/dbus-1.16.2/pass1.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/steps-guix/dbus-1.16.2/pass1.sh b/steps-guix/dbus-1.16.2/pass1.sh index 3f2e73ec..333d4005 100644 --- a/steps-guix/dbus-1.16.2/pass1.sh +++ b/steps-guix/dbus-1.16.2/pass1.sh @@ -5,14 +5,20 @@ src_prepare() { } src_configure() { + local cmake_libdir + cmake_libdir="${LIBDIR#${PREFIX}/}" + if [ "${cmake_libdir}" = "${LIBDIR}" ]; then + cmake_libdir="${LIBDIR#/}" + fi + mkdir -p build cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" \ - -DCMAKE_INSTALL_INCLUDEDIR="${PREFIX}/include" \ + -DCMAKE_INSTALL_LIBDIR="${cmake_libdir}" \ + -DCMAKE_INSTALL_INCLUDEDIR="include" \ -DCMAKE_PREFIX_PATH="${PREFIX}" \ -DCMAKE_INCLUDE_PATH="${PREFIX}/include" \ -DCMAKE_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib" \