diff options
| author | Anton Plotnikov <plotnikovanton@gmail.com> | 2020-10-13 12:01:23 +0300 |
|---|---|---|
| committer | Anton Plotnikov <plotnikovanton@gmail.com> | 2020-10-23 11:03:31 +0300 |
| commit | 1321ae850c12ae223b4ca8468ecb14519e1d69f8 (patch) | |
| tree | c24f65968b85ff8c9993ebec237ca5e769ce178b | |
| parent | 33b7529b01709e54f34c61b9416ae2543d3e8020 (diff) | |
| download | nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar.gz nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar.bz2 nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar.lz nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar.xz nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.tar.zst nixpkgs-1321ae850c12ae223b4ca8468ecb14519e1d69f8.zip | |
fido2luks: 0.2.3 -> 0.2.15
Also remove interactive flag from initrd, because of broken io.
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/fido2luks/default.nix | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 88190e8200b..8dd2ea20519 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -404,7 +404,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase + fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 729a3f7297c..d2a5d91467a 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -3,23 +3,29 @@ , fetchFromGitHub , cryptsetup , pkg-config +, clang +, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.3"; + version = "0.2.15"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x"; + sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; }; buildInputs = [ cryptsetup ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config clang ]; - cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f"; + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.libclang}/lib" + ''; + + cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; meta = with stdenv.lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; |