diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2020-02-24 18:44:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 18:44:58 +0100 |
| commit | f5d2675512dbd267c7f026419f16b3c2e46ab4f9 (patch) | |
| tree | 025e30c522335490ca748e5394e3a31ea159f771 /pkgs/development/libraries | |
| parent | 4080e7976e71a147c056120a1694b0d54d638f49 (diff) | |
| parent | 099359afc72d34255b78cdcc6291b77b2e7ed2f9 (diff) | |
| download | nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar.gz nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar.bz2 nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar.lz nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar.xz nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.tar.zst nixlib-f5d2675512dbd267c7f026419f16b3c2e46ab4f9.zip | |
Merge pull request #80909 from artemist/libfido2
libfido2: add macOS support
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libfido2/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/libfido2/detect_apple_ld.patch | 11 |
2 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 32d19283974c..01a73f4a1308 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb"; + sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds"; }; 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; { description = '' @@ -20,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Yubico/libfido2; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch new file mode 100644 index 000000000000..de972e0f3586 --- /dev/null +++ b/pkgs/development/libraries/libfido2/detect_apple_ld.patch @@ -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") |