xiphos: clean up dependencies
- Moved build dependencies to native. - Most of those added in 4.2.1 update are only transitive. - Switched to GTK 3. - The GNOME 2 dependencies can me removed as they are not used. - Except for GTKHtml since WebKit2-based editor is not implemented. - Python is not needed either. - D-Bus functionality requires a patch to build - gsf was replaced by minizip – https://github.com/crosswire/xiphos/pull/1003
This commit is contained in:
parent
7cf24465b2
commit
a3720ac9a1
|
@ -0,0 +1,38 @@
|
||||||
|
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
|
||||||
|
@@ -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
|
||||||
|
|
|
@ -3,47 +3,27 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, appstream-glib
|
, appstream-glib
|
||||||
, at-spi2-core
|
|
||||||
, biblesync
|
, biblesync
|
||||||
, brotli
|
|
||||||
, cmake
|
, cmake
|
||||||
, dbus
|
|
||||||
, dbus-glib
|
, dbus-glib
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, docbook2x
|
, docbook2x
|
||||||
, docbook_xml_dtd_412
|
, docbook_xml_dtd_412
|
||||||
, enchant
|
, enchant2
|
||||||
, gconf
|
|
||||||
, glib
|
, glib
|
||||||
, gnome-doc-utils
|
, gtk3
|
||||||
, gtk2
|
|
||||||
, gtkhtml
|
, gtkhtml
|
||||||
, icu
|
, icu
|
||||||
, intltool
|
, intltool
|
||||||
, isocodes
|
, isocodes
|
||||||
, itstool
|
, itstool
|
||||||
, libdatrie
|
|
||||||
, libepoxy
|
|
||||||
, libglade
|
|
||||||
, libgsf
|
|
||||||
, libpsl
|
|
||||||
, libselinux
|
|
||||||
, libsepol
|
|
||||||
, libsysprof-capture
|
|
||||||
, libthai
|
|
||||||
, libuuid
|
, libuuid
|
||||||
, libxkbcommon
|
|
||||||
, libxslt
|
, libxslt
|
||||||
, minizip
|
, minizip
|
||||||
, pcre
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python
|
|
||||||
, scrollkeeper
|
|
||||||
, sqlite
|
|
||||||
, sword
|
, sword
|
||||||
, webkitgtk
|
, webkitgtk
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, xorg
|
|
||||||
, yelp-tools
|
, yelp-tools
|
||||||
, zip
|
, zip
|
||||||
}:
|
}:
|
||||||
|
@ -68,61 +48,44 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck=";
|
sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck=";
|
||||||
extraPrefix = "";
|
extraPrefix = "";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Fix D-Bus build
|
||||||
|
# https://github.com/crosswire/xiphos/pull/1103
|
||||||
|
./0001-Add-dbus-glib-dependency-to-main.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
appstream-glib # for appstream-util
|
appstream-glib # for appstream-util
|
||||||
cmake
|
cmake
|
||||||
desktop-file-utils # for desktop-file-validate
|
desktop-file-utils # for desktop-file-validate
|
||||||
|
docbook2x
|
||||||
|
docbook_xml_dtd_412
|
||||||
|
intltool
|
||||||
itstool
|
itstool
|
||||||
|
libxslt
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
yelp-tools # for yelp-build
|
yelp-tools # for yelp-build
|
||||||
|
zip # for building help epubs
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
at-spi2-core
|
|
||||||
biblesync
|
biblesync
|
||||||
brotli
|
|
||||||
dbus
|
|
||||||
dbus-glib
|
dbus-glib
|
||||||
docbook2x
|
enchant2
|
||||||
docbook_xml_dtd_412
|
|
||||||
enchant
|
|
||||||
gconf
|
|
||||||
glib
|
glib
|
||||||
gnome-doc-utils
|
gtk3
|
||||||
gtk2
|
|
||||||
gtkhtml
|
gtkhtml
|
||||||
icu
|
icu
|
||||||
intltool
|
|
||||||
isocodes
|
isocodes
|
||||||
libdatrie
|
|
||||||
libepoxy
|
|
||||||
libglade
|
|
||||||
libgsf
|
|
||||||
libpsl
|
|
||||||
libselinux
|
|
||||||
libsepol
|
|
||||||
libsysprof-capture
|
|
||||||
libthai
|
|
||||||
libuuid
|
libuuid
|
||||||
libxkbcommon
|
|
||||||
libxslt
|
|
||||||
minizip
|
minizip
|
||||||
pcre
|
|
||||||
python
|
|
||||||
scrollkeeper
|
|
||||||
sqlite
|
|
||||||
sword
|
sword
|
||||||
webkitgtk
|
webkitgtk
|
||||||
xorg.libXdmcp
|
|
||||||
xorg.libXtst
|
|
||||||
zip
|
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DDBUS=OFF"
|
# WebKit-based editor does not build.
|
||||||
"-DGTKHTML=ON"
|
"-DGTKHTML=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -29748,11 +29748,7 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
xiphos = callPackage ../applications/misc/xiphos {
|
xiphos = callPackage ../applications/misc/xiphos {
|
||||||
gconf = gnome2.GConf;
|
|
||||||
inherit (gnome2) libglade scrollkeeper;
|
|
||||||
gtkhtml = gnome2.gtkhtml4;
|
gtkhtml = gnome2.gtkhtml4;
|
||||||
python = python27;
|
|
||||||
enchant = enchant2;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xournal = callPackage ../applications/graphics/xournal {
|
xournal = callPackage ../applications/graphics/xournal {
|
||||||
|
|
Loading…
Reference in a new issue