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

Merge pull request #49572 from vaibhavsagar/bump-lightstep-tracer-cpp

Browse Source 
lightstep-tracer-cpp: 0.36 -> 0.8.1
This commit is contained in:
Sarah Brofeldt 2018-11-01 10:01:38 +01:00 committed by GitHub
commit 9fce8d5203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/lightstep-tracer-cpp/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake { stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
, autoreconfHook, zlib , opentracing-cpp, enableGrpc ? false
, enableGrpc ? false
}: }:
let let
@ -9,33 +8,31 @@ let
fetchFromGitHub { fetchFromGitHub {
owner = "lightstep"; owner = "lightstep";
repo = "lightstep-tracer-common"; repo = "lightstep-tracer-common";
rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded"; rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln"; sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lightstep-tracer-cpp-${version}"; name = "lightstep-tracer-cpp-${version}";
version = "0.36"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightstep"; owner = "lightstep";
repo = "lightstep-tracer-cpp"; repo = "lightstep-tracer-cpp";
rev = "v0_36"; rev = "v${version}";
sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16"; sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
}; };
postUnpack = '' postUnpack = ''
cp -r ${common}/* $sourceRoot/lightstep-tracer-common cp -r ${common}/* $sourceRoot/lightstep-tracer-common
''; '';
preConfigure = lib.optionalString (!enableGrpc) '' cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
configureFlagsArray+=("--disable-grpc")
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig automake autoreconfHook pkgconfig cmake
]; ];
buildInputs = [ buildInputs = [
@ -48,6 +45,5 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ]; maintainers = with maintainers; [ cstrahan ];
broken = true; # 2018-02-16
}; };
} }