diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-05 15:15:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 15:15:26 +0100 |
| commit | 0113a5ec29c58cdc8e686620b0d64e2b938248a5 (patch) | |
| tree | 86d11250630104e8e87637e7765613a6a4760d50 | |
| parent | 35a65a670473ed6d0db34e2f68aaa1b28f44bd83 (diff) | |
| parent | fa5ecc2d1a6123feb8740496656a04c5d1986849 (diff) | |
| download | nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar.gz nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar.bz2 nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar.lz nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar.xz nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.tar.zst nixpkgs-0113a5ec29c58cdc8e686620b0d64e2b938248a5.zip | |
Merge pull request #23340 from alibabzo/fix/msgpack-tools
msgpack-tools: fix hydra build
| -rw-r--r-- | pkgs/development/tools/msgpack-tools/default.nix | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index d83be1c1431..2b5f42b2cbe 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -1,17 +1,39 @@ -{ stdenv, fetchFromGitHub, cmake }: - +{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: stdenv.mkDerivation rec { name = "msgpack-tools-${version}"; - version = "v0.6"; + version = "0.6"; src = fetchFromGitHub { owner = "ludocode"; repo = "msgpack-tools"; - rev = version; + rev = "v${version}"; sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5"; }; - buildInputs = [ cmake ]; + libb64 = fetchurl { + url = "mirror://sourceforge/libb64/libb64-1.2.1.zip"; + sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410"; + }; + + rapidjson = fetchurl { + url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz"; + sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw"; + }; + + mpack = fetchurl { + url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz"; + sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg"; + }; + + postUnpack = '' + mkdir $sourceRoot/contrib + cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz + cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip + cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz + ''; + + + buildInputs = [ cmake unzip ]; meta = with stdenv.lib; { description = "Command-line tools for converting between MessagePack and JSON"; |