diff --git a/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch b/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch new file mode 100644 index 000000000000..71cb57ccef18 --- /dev/null +++ b/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch @@ -0,0 +1,38 @@ +From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +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 + | ^~~~~~~~~~~~~~~~~~ + 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 +@@ -74,3 +74,14 @@ target_link_libraries(main + 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) +-- +2.34.1 + diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 38349777edba..994127baca6d 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -3,47 +3,27 @@ , fetchFromGitHub , fetchpatch , appstream-glib -, at-spi2-core , biblesync -, brotli , cmake -, dbus , dbus-glib , desktop-file-utils , docbook2x , docbook_xml_dtd_412 -, enchant -, gconf +, enchant2 , glib -, gnome-doc-utils -, gtk2 +, gtk3 , gtkhtml , icu , intltool , isocodes , itstool -, libdatrie -, libepoxy -, libglade -, libgsf -, libpsl -, libselinux -, libsepol -, libsysprof-capture -, libthai , libuuid -, libxkbcommon , libxslt , minizip -, pcre , pkg-config -, python -, scrollkeeper -, sqlite , sword , webkitgtk , wrapGAppsHook -, xorg , yelp-tools , zip }: @@ -68,61 +48,44 @@ stdenv.mkDerivation rec { sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck="; extraPrefix = ""; }) + + # Fix D-Bus build + # https://github.com/crosswire/xiphos/pull/1103 + ./0001-Add-dbus-glib-dependency-to-main.patch ]; nativeBuildInputs = [ appstream-glib # for appstream-util cmake desktop-file-utils # for desktop-file-validate + docbook2x + docbook_xml_dtd_412 + intltool itstool + libxslt pkg-config wrapGAppsHook yelp-tools # for yelp-build + zip # for building help epubs ]; buildInputs = [ - at-spi2-core biblesync - brotli - dbus dbus-glib - docbook2x - docbook_xml_dtd_412 - enchant - gconf + enchant2 glib - gnome-doc-utils - gtk2 + gtk3 gtkhtml icu - intltool isocodes - libdatrie - libepoxy - libglade - libgsf - libpsl - libselinux - libsepol - libsysprof-capture - libthai libuuid - libxkbcommon - libxslt minizip - pcre - python - scrollkeeper - sqlite sword webkitgtk - xorg.libXdmcp - xorg.libXtst - zip ]; cmakeFlags = [ - "-DDBUS=OFF" + # WebKit-based editor does not build. "-DGTKHTML=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bebf6697029..ccbbcfc78b30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29748,11 +29748,7 @@ with pkgs; }; xiphos = callPackage ../applications/misc/xiphos { - gconf = gnome2.GConf; - inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; - python = python27; - enchant = enchant2; }; xournal = callPackage ../applications/graphics/xournal {