cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

prometheus-cpp: fix use with CMake and clean up

Browse source 
The derivation did not properly propagate it's
dependency on civetweb, causing dependent CMake
derivations not to find it. So just move it to
propagatedBuildInputs instead of messing with
the cmakeFlags.

Also, split off "dev" so we don't carry around
the headers as a runtime dependency.
This commit is contained in:
Matthias Treydte 2022-03-22 12:30:20 +01:00 committed by Cole Helbling
parent 3ff5f0eb76
commit 252608fbbb
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/prometheus-cpp/default.nix
View file

@ -21,22 +21,20 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ gbenchmark civetweb gtest zlib curl ]; buildInputs = [ gbenchmark gtest zlib curl ];
propagatedBuildInputs = [ civetweb ];
strictDeps = true; strictDeps = true;
cmakeFlags = [ cmakeFlags = [
"-DUSE_THIRDPARTY_LIBRARIES=OFF" "-DUSE_THIRDPARTY_LIBRARIES=OFF"
"-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include"
"-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
]; ];
NIX_LDFLAGS = "-ldl"; outputs = [ "out" "dev" ];
postInstall = '' postInstall = ''
mkdir -p $out/lib/pkgconfig mkdir -p $dev/lib/pkgconfig
substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc
''; '';
meta = { meta = {