Merge pull request #163567 from hercules-ci/nix-propagate-nlohmann-json

nixVersions.nix_2_7: Propagate nlohmann_json
main
Bernardo Meurer 2 years ago committed by GitHub
commit fcd48a5a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      pkgs/tools/package-management/nix/common.nix

@ -101,15 +101,17 @@ stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
] ++ lib.optional (atLeast27) [
nlohmann_json
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [
aws-sdk-cpp
];
propagatedBuildInputs = [ boehmgc ];
propagatedBuildInputs = [
boehmgc
] ++ lib.optional (atLeast27) [
nlohmann_json
];
NIX_LDFLAGS = lib.optionals (!atLeast24) [
# https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba

Loading…
Cancel
Save