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

Merge pull request #44065 from Ericson2314/no-crossAttrs-master

Browse Source 
treewide: Remove some crossAttrs
This commit is contained in:
John Ericson
2018-07-24 18:30:14 -04:00
committed by GitHub
parent 4295da8af4 1f9838ea34
commit d4f5ee8199
6 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/nlohmann_json/default.nix
View File

@@ -15,17 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
doCheck = true;
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
checkTarget = "test";
enableParallelBuilding = true;
crossAttrs = {
cmakeFlags = "-DBuildTests=OFF";
doCheck = false;
} // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows";
};
cmakeFlags = [
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [
"-DCMAKE_SYSTEM_NAME=Windows"
];
meta = with stdenv.lib; {
description = "Header only C++ library for the JSON file format";