diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-11 23:26:40 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-11 23:26:43 +0300 |
| commit | 27a4820c748d5e970b8e1abd4dba9b31ce00e850 (patch) | |
| tree | 3b0d4cd0234163bf95744200f2f2f484a8ec3a15 /pkgs/servers | |
| parent | f3ecd570ed68a801ff7f1522319d4fa5caf774c5 (diff) | |
| download | nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar.gz nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar.bz2 nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar.lz nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar.xz nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.tar.zst nixlib-27a4820c748d5e970b8e1abd4dba9b31ce00e850.zip | |
trezord: rebuild protobuf files
This allows it to build with Protobuf 3.6
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/trezord/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 71e51d4c765c..bdc37b700e5d 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp +{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp , libusb1, libmicrohttpd }: @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4"; }; + common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e"; + sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg"; + }; + meta = with stdenv.lib; { description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; homepage = https://mytrezor.com; @@ -40,8 +47,15 @@ stdenv.mkDerivation rec { jsoncpp ]; + preConfigure = '' + ( cd src/config + ln -s $common/protob/config.proto + protoc -I . --cpp_out=. config.proto + ) + ''; + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; - cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'"; + cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ]; installPhase = '' mkdir -p $out/bin |