b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #125647 from alyssais/nix-libsodium

Browse source 
nix: always depend on libsodium
This commit is contained in:
Eelco Dolstra 2021-06-04 12:59:39 +02:00 committed by GitHub
parent 3df02b20f7 45eeabf3a1
commit 4efbeba892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/tools/package-management/nix/default.nix
View file

@ -50,11 +50,10 @@ common =
];
buildInputs =
[ curl openssl sqlite xz bzip2 nlohmann_json
[ curl libsodium openssl sqlite xz bzip2 nlohmann_json
brotli boost editline
]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gtest lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp