mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
593cd7f73f
* gnu/packages/books.scm (xiphos): New variable. * gnu/packages/patches/xiphos-glib.patch: New file. * gnu/local.mk (dist_PATCH_DATA): Add it. Change-Id: I17f3e14c7721887fcb1852e7f07e80fc48d48a79 Signed-off-by: Andreas Enge <andreas@enge.fr>
43 lines
No EOL
1.3 KiB
Diff
43 lines
No EOL
1.3 KiB
Diff
This patch has already been upstreamed, see: <https://github.com/crosswire/xiphos/pull/1103>.
|
|
It should be removed once Xiphos updates.
|
|
|
|
From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001
|
|
From: Jan Tojnar <jtojnar@gmail.com>
|
|
Date: Sat, 15 Jan 2022 05:00:37 +0100
|
|
Subject: [PATCH] Add dbus-glib dependency to main
|
|
|
|
It is required through the ipc header and the build will fail without it on Nix:
|
|
|
|
In file included from /build/source/src/main/search_sidebar.cc:48:
|
|
/build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory
|
|
26 | #include <dbus/dbus-glib.h>
|
|
| ^~~~~~~~~~~~~~~~~~
|
|
compilation terminated.
|
|
---
|
|
src/main/CMakeLists.txt | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
|
|
index 49b86371..bb8e4bb6 100644
|
|
--- a/src/main/CMakeLists.txt
|
|
+++ b/src/main/CMakeLists.txt
|
|
@@ -75,7 +75,18 @@ target_link_libraries(main
|
|
PkgConfig::Soup
|
|
PkgConfig::Sword
|
|
PkgConfig::Biblesync
|
|
- )
|
|
+)
|
|
+
|
|
+IF (DBUS)
|
|
+ target_include_directories (main
|
|
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
|
|
+ PkgConfig::DBus
|
|
+ )
|
|
+ target_link_libraries(main
|
|
+ PRIVATE
|
|
+ PkgConfig::DBus
|
|
+ )
|
|
+ENDIF (DBUS)
|
|
|
|
if(WK_FOUND)
|
|
target_compile_definitions(main
|