tjh.dev
xiphos: 4.2.1 -> 4.3.2
+6
-3
pkgs/by-name/xi/xiphos/0001-Add-dbus-glib-dependency-to-main.patch
+6
-3
pkgs/by-name/xi/xiphos/0001-Add-dbus-glib-dependency-to-main.patch
···
18
index 49b86371..bb8e4bb6 100644
19
--- a/src/main/CMakeLists.txt
20
+++ b/src/main/CMakeLists.txt
21
-
@@ -74,3 +74,14 @@ target_link_libraries(main
22
-
PkgConfig::Sword
23
PkgConfig::Biblesync
24
)
25
-
+
26
+IF (DBUS)
27
+ target_include_directories (main
28
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
···
33
+ PkgConfig::DBus
34
+ )
35
+ENDIF (DBUS)
36
--
37
2.34.1
38
···
18
index 49b86371..bb8e4bb6 100644
19
--- a/src/main/CMakeLists.txt
20
+++ b/src/main/CMakeLists.txt
21
+
@@ -77,6 +77,17 @@
22
PkgConfig::Biblesync
23
)
24
+
25
+IF (DBUS)
26
+ target_include_directories (main
27
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
···
32
+ PkgConfig::DBus
33
+ )
34
+ENDIF (DBUS)
35
+
+
36
+
if(WK_FOUND)
37
+
target_compile_definitions(main
38
+
PRIVATE
39
--
40
2.34.1
41
+9
-25
pkgs/by-name/xi/xiphos/package.nix
+9
-25
pkgs/by-name/xi/xiphos/package.nix
···
1
{
2
-
stdenv,
3
lib,
4
fetchFromGitHub,
5
-
fetchpatch,
6
appstream-glib,
7
biblesync,
8
cmake,
···
10
desktop-file-utils,
11
docbook2x,
12
docbook_xml_dtd_412,
13
-
enchant2,
14
glib,
15
-
gtk3,
16
gtkhtml,
17
icu,
18
intltool,
19
-
isocodes,
20
itstool,
21
libuuid,
22
libxslt,
23
minizip,
24
pkg-config,
25
sword,
26
-
webkitgtk_4_0,
27
wrapGAppsHook3,
28
yelp-tools,
29
zip,
30
}:
31
32
-
stdenv.mkDerivation rec {
33
pname = "xiphos";
34
-
version = "4.2.1";
35
36
src = fetchFromGitHub {
37
owner = "crosswire";
38
repo = "xiphos";
39
-
rev = version;
40
-
hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8=";
41
};
42
43
patches = [
44
-
# GLIB_VERSION_MIN_REQUIRED is not defined.
45
-
# https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874
46
-
(fetchpatch {
47
-
name = "xiphos-glibc.patch";
48
-
url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8";
49
-
sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck=";
50
-
extraPrefix = "";
51
-
})
52
-
53
# Fix D-Bus build
54
# https://github.com/crosswire/xiphos/pull/1103
55
./0001-Add-dbus-glib-dependency-to-main.patch
···
73
buildInputs = [
74
biblesync
75
dbus-glib
76
-
enchant2
77
glib
78
-
gtk3
79
gtkhtml
80
icu
81
-
isocodes
82
libuuid
83
minizip
84
sword
85
-
webkitgtk_4_0
86
];
87
88
cmakeFlags = [
···
92
93
preConfigure = ''
94
# The build script won't continue without the version saved locally.
95
-
echo "${version}" > cmake/source_version.txt
96
97
export SWORD_HOME=${sword};
98
'';
···
110
maintainers = [ ];
111
platforms = lib.platforms.linux;
112
};
113
-
}
···
1
{
2
lib,
3
+
stdenv,
4
fetchFromGitHub,
5
appstream-glib,
6
biblesync,
7
cmake,
···
9
desktop-file-utils,
10
docbook2x,
11
docbook_xml_dtd_412,
12
glib,
13
gtkhtml,
14
icu,
15
intltool,
16
itstool,
17
libuuid,
18
libxslt,
19
minizip,
20
pkg-config,
21
sword,
22
+
webkitgtk_4_1,
23
wrapGAppsHook3,
24
yelp-tools,
25
zip,
26
}:
27
28
+
stdenv.mkDerivation (finalAttrs: {
29
pname = "xiphos";
30
+
version = "4.3.2";
31
32
src = fetchFromGitHub {
33
owner = "crosswire";
34
repo = "xiphos";
35
+
tag = finalAttrs.version;
36
+
hash = "sha256-HTndBWfze8tV4G9npLYB7SkgpJNQcQBZqHKjxhZU6JY=";
37
};
38
39
patches = [
40
# Fix D-Bus build
41
# https://github.com/crosswire/xiphos/pull/1103
42
./0001-Add-dbus-glib-dependency-to-main.patch
···
60
buildInputs = [
61
biblesync
62
dbus-glib
63
glib
64
gtkhtml
65
icu
66
libuuid
67
minizip
68
sword
69
+
webkitgtk_4_1
70
];
71
72
cmakeFlags = [
···
76
77
preConfigure = ''
78
# The build script won't continue without the version saved locally.
79
+
echo "${finalAttrs.version}" > cmake/source_version.txt
80
81
export SWORD_HOME=${sword};
82
'';
···
94
maintainers = [ ];
95
platforms = lib.platforms.linux;
96
};
97
+
})