From c18679f100536a553bb8a17bc38e1cea0ecb2684 Mon Sep 17 00:00:00 2001 From: Akos Miklos Date: Wed, 17 Dec 2025 02:59:30 +0100 Subject: [PATCH 1/2] eiskaltdcpp: fix build by adding minimum version policy to cmakeFlags fix EiskaltDC++ compilation from nixpkgs by adding -DCMAKE_POLICY_VERSION_MINIMUM=3.5 --- .../networking/p2p/eiskaltdcpp/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 9dad2f63d9d9..60601ed56092 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -66,6 +66,17 @@ mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6.3)" "cmake_minimum_required (VERSION 3.10)" + substituteInPlace {dcpp,dht,extra,}json/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)" + substituteInPlace eiskaltdcpp-{cli,daemon}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)" + substituteInPlace eiskaltdcpp-qt/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8.11)" "cmake_minimum_required (VERSION 3.10)" + ''; + cmakeFlags = [ "-DDBUS_NOTIFY=ON" "-DFREE_SPACE_BAR_C=ON" From 63af1fa83cff901f3eb4817452bfb9bd6226bcbe Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 24 Mar 2026 00:31:24 +0100 Subject: [PATCH 2/2] eiskaltdcpp: use lib.cmakeBool --- .../networking/p2p/eiskaltdcpp/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 60601ed56092..9e749cc96f0d 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -78,16 +78,16 @@ mkDerivation rec { ''; cmakeFlags = [ - "-DDBUS_NOTIFY=ON" - "-DFREE_SPACE_BAR_C=ON" - "-DLUA_SCRIPT=ON" - "-DPERL_REGEX=ON" - "-DUSE_ASPELL=ON" - "-DUSE_CLI_JSONRPC=ON" - "-DUSE_MINIUPNP=ON" - "-DUSE_JS=ON" - "-DWITH_LUASCRIPTS=ON" - "-DWITH_SOUNDS=ON" + (lib.cmakeBool "DBUS_NOTIFY" true) + (lib.cmakeBool "FREE_SPACE_BAR_C" true) + (lib.cmakeBool "LUA_SCRIPT" true) + (lib.cmakeBool "PERL_REGEX" true) + (lib.cmakeBool "USE_ASPELL" true) + (lib.cmakeBool "USE_CLI_JSONRPC" true) + (lib.cmakeBool "USE_MINIUPNP" true) + (lib.cmakeBool "USE_JS" true) + (lib.cmakeBool "WITH_LUASCRIPTS" true) + (lib.cmakeBool "WITH_SOUNDS" true) ]; postInstall = ''