libfido2: 1.3.1 -> 1.4.0

- drop upstreamed patches
- use system hidapi

pkgs/development/libraries/libfido2/default.nix

@@ -3,45 +3,28 @@
 , fetchpatch
 , cmake
 , pkgconfig
+, hidapi
 , libcbor
 , openssl
 , udev
-, IOKit }:
+}:
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.3.1";
+  version = "1.4.0";
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds";
+    sha256 = "0v1a3n0qljmrp8y9pmnmbsdsy79l3z84qmhyjx50xdsbgnz1z4md";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ libcbor openssl ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ udev ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
-
-  patches = [
-    # fix build on darwin
-    (fetchpatch {
-      url = "https://github.com/Yubico/libfido2/commit/916ebd18a89e4028de203d603726805339be7a5b.patch";
-      sha256 = "07f0xpxnq02cccmqcric87b6pms7k7ssvdw722zr970a6qs8p6i7";
-    })
-    # allow attestation using any supported algorithm
-    (fetchpatch {
-      url = "https://github.com/Yubico/libfido2/commit/f7a9471fa0588cb91cbefffb13c1e4d06c2179b7.patch";
-      sha256 = "02qbw9bqy3sixvwig6az7v3vimgznxnfikn9p1jczm3d7mn8asw2";
-    })
-    # fix EdDSA attestation signature verification bug
-    (fetchpatch {
-      url = "https://github.com/Yubico/libfido2/commit/95126eea52294419515e6540dfd7220f35664c48.patch";
-      sha256 = "076mwpl9xndjhy359jdv2drrwyq7wd3pampkn28mn1rlwxfgf0d0";
-    })
-  ];
+  buildInputs = [ hidapi libcbor openssl ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
 
   cmakeFlags = [
     "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+    "-DUSE_HIDAPI=1"
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 

pkgs/development/libraries/libfido2/detect_apple_ld.patch

@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2020-02-19 17:21:59.000000000 +0000
-+++ b/CMakeLists.txt	2020-02-23 15:57:34.241115306 +0000
-@@ -296,7 +296,7 @@
- endif()
- 
- # export list
--if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-+if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")	
- 	# clang + lld
- 	string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
- 	    " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm")

pkgs/top-level/all-packages.nix

@@ -12684,9 +12684,7 @@ in
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
-  libfido2 = callPackage ../development/libraries/libfido2 {
-    inherit (darwin.apple_sdk.frameworks) IOKit;
-  };
+  libfido2 = callPackage ../development/libraries/libfido2 { };
 
   libfilezilla = callPackage ../development/libraries/libfilezilla { };