summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2020-10-11 15:15:54 -0400
committerGitHub <noreply@github.com>2020-10-11 15:15:54 -0400
commitaba04eb8af12056bf9fb0c3c4f1c23541454fa75 (patch)
tree339698d7c878b0aaec76d15dde806cb1e6d9d038
parent3a520ad45c0bea79646464334135eb3767f46f0f (diff)
downloadnixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar.gz
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar.bz2
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar.lz
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar.xz
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.tar.zst
nixpkgs-aba04eb8af12056bf9fb0c3c4f1c23541454fa75.zip
pam_u2f: 1.0.8 -> 1.1.0 (#100046)
This release switches to libfido2 and libcrypto instead of libu2f-host
and libu2f-server.
-rw-r--r--pkgs/os-specific/linux/pam_u2f/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 30acb86d860..d8d9a96652c 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }:
+{ stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "pam_u2f";
-  version = "1.0.8";
+  version = "1.1.0";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
-    sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj";
+    sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libu2f-host libu2f-server pam ];
-
-  # Fix the broken include in 1.0.1
-  CFLAGS = "-I${libu2f-host}/include/u2f-host";
+  buildInputs = [ libfido2 pam openssl ];
 
   preConfigure = ''
     configureFlagsArray+=("--with-pam-dir=$out/lib/security")