JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: Install nlohmann_json headers

Browse Source
This commit is contained in:
Robert Hensing 2021-11-11 11:45:26 +01:00
parent c9211af93a
commit 2d1be9cd9a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/package-management/nix/default.nix
View File

@ -58,7 +58,7 @@ common =
]; ];
buildInputs = buildInputs =
[ curl libsodium openssl sqlite xz bzip2 nlohmann_json [ curl libsodium openssl sqlite xz bzip2
brotli boost editline brotli boost editline
] ]
++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isDarwin [ Security ]
@ -209,6 +209,13 @@ common =
]; ];
}); });
# master: https://github.com/NixOS/nix/pull/5536
# 2.4: https://github.com/NixOS/nix/pull/5537
installNlohmannJsonPatch = fetchpatch {
url = "https://github.com/NixOS/nix/pull/5536.diff";
sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo=";
};
in rec { in rec {
nix = nixStable; nix = nixStable;
@ -241,6 +248,8 @@ in rec {
boehmgc = boehmgc_nixUnstable; boehmgc = boehmgc_nixUnstable;
patches = [ installNlohmannJsonPatch ];
inherit storeDir stateDir confDir; inherit storeDir stateDir confDir;
}); });
@ -258,6 +267,8 @@ in rec {
boehmgc = boehmgc_nixUnstable; boehmgc = boehmgc_nixUnstable;
patches = [ installNlohmannJsonPatch ];
inherit storeDir stateDir confDir; inherit storeDir stateDir confDir;
}); });