Merge pull request #331612 from GaetanLepage/abseil-cpp

This commit is contained in:
Sandro
2024-08-06 11:29:11 +02:00
committed by GitHub
2 changed files with 8 additions and 8 deletions
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "abseil-cpp";
version = "20240116.2";
version = "20240722.0";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=";
};
cmakeFlags = [
@@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ gtest ];
meta = with lib; {
meta = {
description = "Open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.GaetanLepage ];
license = lib.licenses.asl20;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.GaetanLepage ];
};
})
+2 -2
View File
@@ -19430,13 +19430,13 @@ with pkgs;
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix {
# If abseil-cpp doesnt have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.isDarwin && stdenv.isx86_64
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp = abseil-cpp_202401;
abseil-cpp = abseil-cpp_202407;
accountsservice = callPackage ../development/libraries/accountsservice { };