git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #163567 from hercules-ci/nix-propagate-nlohmann-json

nixVersions.nix_2_7: Propagate nlohmann_json

commitfcd48a5a0693f016a5c370460d0c2a8243b882dc authorBernardo Meurer <bernardo@meurer.org> dateThu 10 Mar 2022, 11:12 (5 years ago) parentb1df2f4eeab10b
1 file changed+5−3
pkgs/tools/package-management/nix/common.nix+5−3
pkgs/tools/package-management/nix/common.nix+5−3
@@ -101,15 +101,17 @@ stdenv.mkDerivation {
101101 lowdown
102102 ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
103103 libcpuid
104− ] ++ lib.optional (atLeast27) [
105− nlohmann_json
106104 ] ++ lib.optionals withLibseccomp [
107105 libseccomp
108106 ] ++ lib.optionals withAWS [
109107 aws-sdk-cpp
110108 ];
111109
112− propagatedBuildInputs = [ boehmgc ];
110+ propagatedBuildInputs = [
111+ boehmgc
112+ ] ++ lib.optional (atLeast27) [
113+ nlohmann_json
114+ ];
113115
114116 NIX_LDFLAGS = lib.optionals (!atLeast24) [
115117 # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba