diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
| commit | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (patch) | |
| tree | 16c0b044abef442273e494420381770e6e2b45d5 /pkgs/development/libraries/nlohmann_json/default.nix | |
| parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) | |
| parent | 38eea804e6c02542085c9f232cdd699d96c95a23 (diff) | |
| download | nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.gz nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.bz2 nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.lz nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.xz nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.zst nixpkgs-ae2cf7c00877a3dd778b3e3cabfec682503303d5.zip | |
Merge branch 'staging' into staging-next
There are security fixes for a few packages (and other changes).
Diffstat (limited to 'pkgs/development/libraries/nlohmann_json/default.nix')
| -rw-r--r-- | pkgs/development/libraries/nlohmann_json/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 0e9ff5d9105..8db3a3d92ff 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - checkTarget = "test"; - enableParallelBuilding = true; cmakeFlags = [ @@ -26,6 +23,8 @@ stdenv.mkDerivation rec { "-DCMAKE_SYSTEM_NAME=Windows" ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; homepage = https://github.com/nlohmann/json; |