diff options
author | Chris Webb <chris@arachsys.com> | 2021-10-23 16:49:25 +0100 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-23 12:16:08 -0400 |
commit | 49923376d13f1b22c0388e1b98b5943f782b4f57 (patch) | |
tree | cbfe1a8775bed5f403fb7487c240de864046f15a /default.nix | |
parent | f9f57789de567726f7cfa46bd13df4b0815d137a (diff) | |
download | bcachefs-tools-49923376d13f1b22c0388e1b98b5943f782b4f57.tar.gz |
Use scrypt from libsodium
bcachefs-tools has both libscrypt and libsodium as build dependencies,
but libsodium already includes the same scrypt implementation as libscrypt,
originally written by Colin Percival.
Use the libsodium copy, dropping the extra libscrypt dependency.
Explicitly adopt the default scrypt N, r and p values from libscrypt to
avoid unintended changes in the default work parameters for bcachefs.
Signed-off-by: Chris Webb <chris@arachsys.com>
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/default.nix b/default.nix index eee7300f..48f2aa93 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,6 @@ , pkg-config , attr , libuuid -, libscrypt , libsodium , keyutils @@ -71,7 +70,6 @@ stdenv.mkDerivation { keyutils # libkeyutils lz4 # liblz4 - libscrypt libsodium liburcu libuuid |