diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix index dda515932f2c..2a0f4a88c5ea 100644 --- a/pkgs/by-name/pr/prometheus-cpp/package.nix +++ b/pkgs/by-name/pr/prometheus-cpp/package.nix @@ -1,46 +1,54 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gbenchmark -, gtest -, civetweb -, zlib -, curl +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + civetweb, + curl, + gbenchmark, + gtest, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prometheus-cpp"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "jupp0r"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; + repo = "prometheus-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XQ8N+affKVqn/hrMHWg0eN+0Op6m9ZdVNNAW0GpDAng="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ gbenchmark gtest zlib curl ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + curl + gbenchmark + gtest + zlib + ]; propagatedBuildInputs = [ civetweb ]; strictDeps = true; cmakeFlags = [ - "-DUSE_THIRDPARTY_LIBRARIES=OFF" "-DBUILD_SHARED_LIBS=ON" + "-DOVERRIDE_CXX_STANDARD_FLAGS=OFF" + "-DUSE_THIRDPARTY_LIBRARIES=OFF" ]; - outputs = [ "out" "dev" ]; - - postInstall = '' - mkdir -p $dev/lib/pkgconfig - substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc - ''; + outputs = [ + "out" + "dev" + ]; meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; license = [ lib.licenses.mit ]; }; - -} +}) diff --git a/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in deleted file mode 100644 index c373f4153b55..000000000000 --- a/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include -libdir=${prefix}/lib - -Name: prometheus-cpp -Description: Prometheus Client Library for Modern C++ -URL: https://github.com/jupp0r/prometheus-cpp -Version: @version@ -Cflags: -isystem${includedir} -Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push