public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80909 from artemist/libfido2 

libfido2: add macOS support
This commit is contained in:
Marek Mahut 2020-02-24 18:44:58 +01:00 committed by GitHub
parent 4080e7976e 099359afc7
commit f5d2675512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/libfido2/default.nix
View File

@ -1,17 +1,22 @@
{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: { stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libfido2"; pname = "libfido2";
version = "1.3.0"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb"; sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libcbor libressl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; buildInputs = [ libcbor libressl ]
++ stdenv.lib.optionals stdenv.isLinux [ udev ]
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; patches = [ ./detect_apple_ld.patch ];
cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
"-DCMAKE_INSTALL_LIBDIR=lib" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = ''
@ -20,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Yubico/libfido2; homepage = https://github.com/Yubico/libfido2;
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

11
pkgs/development/libraries/libfido2/detect_apple_ld.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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")

4
pkgs/top-level/all-packages.nix
View File

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