summary refs log tree commit diff
path: root/pkgs/applications/networking/p2p
diff options
context:
space:
mode:
authorBoris Pek <tehnick-8@yandex.ru>2021-03-23 13:14:45 +0300
committerGitHub <noreply@github.com>2021-03-23 11:14:45 +0100
commiteb225f5d9d278da9c8223e5930e215a38137bbe3 (patch)
tree7a4359e919dd1d79da8159dde47d88310ccfacdc /pkgs/applications/networking/p2p
parente94cf01b2dbcbff61b3d1d73a05d35e995d32f47 (diff)
downloadnixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar.gz
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar.bz2
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar.lz
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar.xz
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.tar.zst
nixpkgs-eb225f5d9d278da9c8223e5930e215a38137bbe3.zip
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
Diffstat (limited to 'pkgs/applications/networking/p2p')
-rw-r--r--pkgs/applications/networking/p2p/eiskaltdcpp/default.nix24
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 0174d133011..f86eefe668f 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -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
 , libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
 
@@ -14,30 +14,32 @@ mkDerivation rec {
   };
 
   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; [
       GetoptLong
-      RpcXML
       TermShellUI
     ])) ]
     ++ lib.optional stdenv.isDarwin libiconv;
 
   cmakeFlags = [
-    "-DUSE_ASPELL=ON"
+    "-DDBUS_NOTIFY=ON"
     "-DFREE_SPACE_BAR_C=ON"
+    "-DLUA_SCRIPT=ON"
+    "-DPERL_REGEX=ON"
+    "-DUSE_ASPELL=ON"
+    "-DUSE_CLI_JSONRPC=ON"
     "-DUSE_MINIUPNP=ON"
-    "-DLOCAL_MINIUPNP=ON"
-    "-DDBUS_NOTIFY=ON"
     "-DUSE_JS=ON"
-    "-DPERL_REGEX=ON"
-    "-DUSE_CLI_XMLRPC=ON"
-    "-DWITH_SOUNDS=ON"
-    "-DLUA_SCRIPT=ON"
     "-DWITH_LUASCRIPTS=ON"
+    "-DWITH_SOUNDS=ON"
   ];
 
+  postInstall = ''
+    ln -s $out/bin/$pname-qt $out/bin/$pname
+  '';
+
   preFixup = ''
-    substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \
+    substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \
       --replace "/usr/local" "$out"
   '';