diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/libraries/prometheus-cpp | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/prometheus-cpp')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix index a046f255a6a3..1591f8a332c8 100644 --- a/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix @@ -21,22 +21,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gbenchmark civetweb gtest zlib curl ]; - + buildInputs = [ gbenchmark gtest zlib curl ]; + propagatedBuildInputs = [ civetweb ]; strictDeps = true; cmakeFlags = [ "-DUSE_THIRDPARTY_LIBRARIES=OFF" - "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include" - "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" "-DBUILD_SHARED_LIBS=ON" ]; - NIX_LDFLAGS = "-ldl"; + outputs = [ "out" "dev" ]; postInstall = '' - mkdir -p $out/lib/pkgconfig - substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc + mkdir -p $dev/lib/pkgconfig + substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc ''; meta = { |