Merge pull request #116032 from Mic92/fix-nix

This commit is contained in:
Jörg Thalheim 2021-03-12 14:35:41 +00:00 committed by GitHub
commit 9e31505b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -55,7 +55,8 @@ common =
] ]
++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock lowdown libcpuid ] ++ lib.optionals is24 [ libarchive gmock lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS ++ lib.optional withAWS
((aws-sdk-cpp.override { ((aws-sdk-cpp.override {