From 9ca27e16419c12100e60be2f872c6b59a5f2d340 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Oct 2020 22:07:35 +0200 Subject: [PATCH] fastd: 19 -> 21 (cherry picked from commit 5a4385d4a9c68dde8573e25a33951cc6180a79ea) --- pkgs/tools/networking/fastd/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 8c9a877b8f1ebc..864b57a0c38303 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, bison, pkgconfig +{ stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig , libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { pname = "fastd"; - version = "19"; + version = "21"; src = fetchFromGitHub { owner = "Neoraider"; repo = "fastd"; rev = "v${version}"; - sha256 = "1h3whjvy2n2cyvbkbg4y1z9vlrn790spzbdhj4glwp93xcykhz5i"; + sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw"; }; - postPatch = '' - substituteInPlace src/crypto/cipher/CMakeLists.txt \ - --replace 'add_subdirectory(aes128_ctr)' "" - ''; - - nativeBuildInputs = [ pkgconfig bison cmake ]; + nativeBuildInputs = [ pkgconfig bison meson ninja ]; buildInputs = [ libuecc libsodium libcap json_c openssl ]; - cmakeFlags = [ - "-DENABLE_OPENSSL=true" - ]; - enableParallelBuilding = true; meta = with stdenv.lib; {