pyrox.dev
eiskaltdcpp: remove build dependency from boost (#116998)
eiskaltdcpp: remove build dependency from boost
+ Remove eiskaltdcpp-cli-xmlrpc: it is absolutely useless because XML-RPC
support in eiskaltdcpp-daemon is currently in a broken state
+ Update cmake options
+ eiskaltdcpp: install eiskaltdcpp-cli-jsonrpc
+ eiskaltdcpp: symlink $pname-qt to $pname
+13
-11
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+13
-11
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11
2
, mkDerivation, qtbase, qttools, qtmultimedia, qtscript
3
, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
4
···
14
};
15
16
nativeBuildInputs = [ cmake pkg-config ];
17
-
buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
18
(perl.withPackages (p: with p; [
19
GetoptLong
20
-
RpcXML
21
TermShellUI
22
])) ]
23
++ lib.optional stdenv.isDarwin libiconv;
24
25
cmakeFlags = [
26
-
"-DUSE_ASPELL=ON"
27
"-DFREE_SPACE_BAR_C=ON"
28
"-DUSE_MINIUPNP=ON"
29
-
"-DLOCAL_MINIUPNP=ON"
30
-
"-DDBUS_NOTIFY=ON"
31
"-DUSE_JS=ON"
32
-
"-DPERL_REGEX=ON"
33
-
"-DUSE_CLI_XMLRPC=ON"
34
"-DWITH_SOUNDS=ON"
35
-
"-DLUA_SCRIPT=ON"
36
-
"-DWITH_LUASCRIPTS=ON"
37
];
38
39
preFixup = ''
40
-
substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \
41
--replace "/usr/local" "$out"
42
'';
43
···
1
+
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11
2
, mkDerivation, qtbase, qttools, qtmultimedia, qtscript
3
, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
4
···
14
};
15
16
nativeBuildInputs = [ cmake pkg-config ];
17
+
buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
18
(perl.withPackages (p: with p; [
19
GetoptLong
20
TermShellUI
21
])) ]
22
++ lib.optional stdenv.isDarwin libiconv;
23
24
cmakeFlags = [
25
+
"-DDBUS_NOTIFY=ON"
26
"-DFREE_SPACE_BAR_C=ON"
27
+
"-DLUA_SCRIPT=ON"
28
+
"-DPERL_REGEX=ON"
29
+
"-DUSE_ASPELL=ON"
30
+
"-DUSE_CLI_JSONRPC=ON"
31
"-DUSE_MINIUPNP=ON"
32
"-DUSE_JS=ON"
33
+
"-DWITH_LUASCRIPTS=ON"
34
"-DWITH_SOUNDS=ON"
35
];
36
37
+
postInstall = ''
38
+
ln -s $out/bin/$pname-qt $out/bin/$pname
39
+
'';
40
+
41
preFixup = ''
42
+
substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \
43
--replace "/usr/local" "$out"
44
'';
45