guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch gnome-team updated: gnu: sdbus-c++: Fix generated sdbus-c++.pc.


From: guix-commits
Subject: branch gnome-team updated: gnu: sdbus-c++: Fix generated sdbus-c++.pc.
Date: Thu, 25 Jan 2024 05:29:14 -0500

This is an automated email from the git hooks/post-receive script.

lilyp pushed a commit to branch gnome-team
in repository guix.

The following commit(s) were added to refs/heads/gnome-team by this push:
     new 2e7d78b1f0 gnu: sdbus-c++: Fix generated sdbus-c++.pc.
2e7d78b1f0 is described below

commit 2e7d78b1f02a8eae82c34e5183134c9d1a0d02b3
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Thu Jan 18 22:14:09 2024 +0100

    gnu: sdbus-c++: Fix generated sdbus-c++.pc.
    
    * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add 
‘fix-elogind-requirement’.
    
    Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 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 @@ Some codes examples can be find at:
                                 ;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]