diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix new file mode 100644 index 00000000000..fe2f0eadeeb --- /dev/null +++ b/pkgs/development/libraries/libcbor/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, cmocka }: + +stdenv.mkDerivation rec { + pname = "libcbor"; + version = "2019-02-23"; + + src = fetchFromGitHub { + owner = "PJK"; + repo = pname; + rev = "87f977e732ca216682a8583a0e43803eb6b9c028"; + sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm"; + }; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ cmocka ]; + + doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + + NIX_CFLAGS_COMPILE = [ "-fno-lto" ]; + + meta = with stdenv.lib; { + description = "CBOR protocol implementation for C and others"; + homepage = https://github.com/PJK/libcbor; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix new file mode 100644 index 00000000000..b670172ce1e --- /dev/null +++ b/pkgs/development/libraries/libfido2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: + +stdenv.mkDerivation rec { + pname = "libfido2"; + version = "1.1.0"; + src = fetchurl { + url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; + sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libcbor libressl udev ]; + + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; + + meta = with stdenv.lib; { + description = '' + Provides library functionality for FIDO 2.0, including communication with a device over USB. + ''; + homepage = https://github.com/Yubico/libfido2; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4c01750c0b..f2d9e4a7ac5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11146,6 +11146,8 @@ in then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcbor = callPackage ../development/libraries/libcbor { }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -11310,6 +11312,8 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; + libfido2 = callPackage ../development/libraries/libfido2 { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { };