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

treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

Browse Source
This commit is contained in:
Ben Siraphob
2020-12-31 14:48:55 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/google-cloud-cpp/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
let
googleapis = fetchFromGitHub {
owner = "googleapis";
@@ -16,7 +16,7 @@ let
sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ];
postPatch = ''
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ];
nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ];
nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
outputs = [ "out" "dev" ];