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

google-cloud-cpp: 2.14.0 -> 2.29.0

Browse Source 
Fixes build with latest GCC/glibc/protobuf/etc, also
catches us up on a year of updates.
This commit is contained in:
K900
2024-09-29 08:21:18 +03:00
parent a28eb11846
commit d46eefeffd
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/google-cloud-cpp/default.nix
+8 -19
View File
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, c-ares
, cmake
, crc32c
@@ -20,41 +20,33 @@
}:
let
# defined in cmake/GoogleapisConfig.cmake
googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05";
googleapisRev = "6a474b31c53cc1797710206824a17b364a835d2d";
googleapis = fetchFromGitHub {
name = "googleapis-src";
owner = "googleapis";
repo = "googleapis";
rev = googleapisRev;
hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI=";
hash = "sha256-t5oX6Gc1WSMSBDftXA9RZulckUenxOEHBYeq2qf8jnY=";
};
in
stdenv.mkDerivation rec {
pname = "google-cloud-cpp";
version = "2.14.0";
version = "2.29.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-cpp";
rev = "v${version}";
sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg=";
sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY=";
};
patches = [
# https://github.com/googleapis/google-cloud-cpp/pull/12554, tagged in 2.16.0
(fetchpatch {
name = "prepare-for-GCC-13.patch";
url = "https://github.com/googleapis/google-cloud-cpp/commit/ae30135c86982c36e82bb0f45f99baa48c6a780b.patch";
hash = "sha256-L0qZfdhP8Zt/gYBWvJafteVgBHR8Kup49RoOrLDtj3k=";
(substituteAll {
src = ./hardcode-googleapis-path.patch;
url = googleapis;
})
];
postPatch = ''
substituteInPlace external/googleapis/CMakeLists.txt \
--replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}"
sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt
'';
nativeBuildInputs = [
cmake
ninja
@@ -78,9 +70,6 @@ stdenv.mkDerivation rec {
protobuf
];
# https://hydra.nixos.org/build/222679737/nixlog/3/tail
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=maybe-uninitialized";
doInstallCheck = true;
preInstallCheck =
pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/external/googleapis/CMakeLists.txt
+++ b/external/googleapis/CMakeLists.txt
@@ -20,10 +20,7 @@ endif ()
include(GoogleapisConfig)
-set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL
- "https://github.com/googleapis/googleapis/archive/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz"
- "https://storage.googleapis.com/cloud-cpp-community-archive/github.com/googleapis/googleapis/archive/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz"
-)
+set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL @url@)
set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL_HASH
"${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256}")
if (GOOGLE_CLOUD_CPP_OVERRIDE_GOOGLEAPIS_URL)