diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-03-10 15:29:58 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-03-10 15:35:04 +0100 |
| commit | eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0 (patch) | |
| tree | 4d13e3060ef10a3e4d12af889f834e8c42387b3a /pkgs/tools/package-management | |
| parent | 87fce11f62f21409321ce0f2441f03901c9c8a9f (diff) | |
| download | nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar.gz nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar.bz2 nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar.lz nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar.xz nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.tar.zst nixpkgs-eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0.zip | |
nixVersions.nix_2_7: Propagate nlohmann_json
Just like upstream: https://github.com/NixOS/nix/blob/2.7.0/flake.nix#L136
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 55d2e0b5405..2161ea3c309 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/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 |