diff options
author | Remy Goldschmidt <taktoa@gmail.com> | 2016-09-02 17:23:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-02 17:23:46 -0500 |
commit | 854d16d74eca1a186f422a5eebc7b2befe1f0bc3 (patch) | |
tree | 1686b31ee74f81f233d3a281f7d2a40c97500f53 /pkgs/development/libraries/nlohmann_json/default.nix | |
parent | e2c6740c37428f8d8185fcc907e9e619df50be85 (diff) | |
download | nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar.gz nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar.bz2 nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar.lz nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar.xz nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.tar.zst nixpkgs-854d16d74eca1a186f422a5eebc7b2befe1f0bc3.zip |
nlohmann_json: 2.0.2 -> 2.0.3
`cmake` should be in `nativeBuildInputs` as it is only required at build time. For obvious reasons we can't have the tests running during a cross-compile. I figured I'd update the package version while I was at it, though these changes have also been tested independently of the version update.
Diffstat (limited to 'pkgs/development/libraries/nlohmann_json/default.nix')
-rw-r--r-- | pkgs/development/libraries/nlohmann_json/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 819160a8d7c..dcc0c781ee0 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,20 +2,27 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "10sk8d23vh0c7b3qafjz2n8r5jv8vc275bl069ikhqnx1zxv6hwp"; + sha256 = "192mg2y93g9q0jdn3fdffydpxk19nsrcv92kfip6srkdkwja18ri"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; doCheck = true; checkTarget = "test"; + crossAttrs = { + cmakeFlags = "-DBuildTests=OFF"; + doCheck = false; + } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows"; + }; + meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; homepage = https://github.com/nlohmann/json; |