diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/abseil-cpp | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/abseil-cpp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index 95d1b873edd3..0813a965524b 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20200225.2"; + version = "20200923.3"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; + sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"; }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=17" + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { |