From 2e7d78b1f02a8eae82c34e5183134c9d1a0d02b3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 18 Jan 2024 22:14:09 +0100 Subject: [PATCH] gnu: sdbus-c++: Fix generated sdbus-c++.pc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add ‘fix-elogind-requirement’. Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7b8cc3286d..eee5251d03 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1289,11 +1289,20 @@ (define-public sdbus-c++ ;; Do not install tests. "-DTESTS_INSTALL_PATH=/tmp" "-DCMAKE_VERBOSE_MAKEFILE=ON") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-install-tests - (lambda _ - (substitute* "tests/CMakeLists.txt" - (("/etc/dbus-1/system.d") "/tmp"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-install-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("/etc/dbus-1/system.d") "/tmp")))) + (add-after 'unpack 'fix-elogind-requirement + (lambda _ + ;; sdbus-c++.pc requires 'elogind', but it should + ;; require 'libelogind'. Fixed after 1.4.0 with + ;; fb9e4ae37152648a67814458d3ff673b1d3ca089 + (substitute* "pkgconfig/sdbus-c++.pc.in" + (("@LIBSYSTEMD@") + "libelogind"))))))) (native-inputs (list googletest pkg-config)) (inputs (list expat)) (propagated-inputs (list elogind)) ;required by sdbus-c++.pc