From eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 10 Mar 2022 15:29:58 +0100 Subject: [PATCH] nixVersions.nix_2_7: Propagate nlohmann_json Just like upstream: https://github.com/NixOS/nix/blob/2.7.0/flake.nix#L136 --- pkgs/tools/package-management/nix/common.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 55d2e0b54059..2161ea3c309f 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