Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 4 insertions, 13 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix
index 8c9a877b8f1e..864b57a0c383 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix
+++ b/infra/libkookie/nixpkgs/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; {