jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eiskaltdcpp: remove build dependency from boost (#116998)

Browse Source 
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
This commit is contained in:
Boris Pek 2021-03-23 13:14:45 +03:00 committed by GitHub
parent e94cf01b2d
commit eb225f5d9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11
, mkDerivation, qtbase, qttools, qtmultimedia, qtscript , mkDerivation, qtbase, qttools, qtmultimedia, qtscript
, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }: , libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
@ -14,30 +14,32 @@ mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
(perl.withPackages (p: with p; [ (perl.withPackages (p: with p; [
GetoptLong GetoptLong
RpcXML
TermShellUI TermShellUI
])) ] ])) ]
++ lib.optional stdenv.isDarwin libiconv; ++ lib.optional stdenv.isDarwin libiconv;
cmakeFlags = [ cmakeFlags = [
"-DUSE_ASPELL=ON"
"-DFREE_SPACE_BAR_C=ON"
"-DUSE_MINIUPNP=ON"
"-DLOCAL_MINIUPNP=ON"
"-DDBUS_NOTIFY=ON" "-DDBUS_NOTIFY=ON"
"-DUSE_JS=ON" "-DFREE_SPACE_BAR_C=ON"
"-DPERL_REGEX=ON"
"-DUSE_CLI_XMLRPC=ON"
"-DWITH_SOUNDS=ON"
"-DLUA_SCRIPT=ON" "-DLUA_SCRIPT=ON"
"-DPERL_REGEX=ON"
"-DUSE_ASPELL=ON"
"-DUSE_CLI_JSONRPC=ON"
"-DUSE_MINIUPNP=ON"
"-DUSE_JS=ON"
"-DWITH_LUASCRIPTS=ON" "-DWITH_LUASCRIPTS=ON"
"-DWITH_SOUNDS=ON"
]; ];
postInstall = ''
ln -s $out/bin/$pname-qt $out/bin/$pname
'';
preFixup = '' preFixup = ''
substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \ substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \
--replace "/usr/local" "$out" --replace "/usr/local" "$out"
''; '';