alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #117160 from marsam/abseil-cpp-shared

Browse source 
abseil-cpp: build shared
This commit is contained in:
Mario Rodas 2021-03-28 09:34:38 -05:00 committed by GitHub
parent 4aacd02d33 f3228cce6d
commit 9f759c4a1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/abseil-cpp/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }: { lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abseil-cpp"; pname = "abseil-cpp";
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_STANDARD=17" "-DCMAKE_CXX_STANDARD=17"
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/grpc/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
, gflags, libnsl , gflags, abseil-cpp, libnsl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ c-ares re2 zlib ]; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ];
buildInputs = [ c-ares.cmake-config openssl protobuf gflags ] buildInputs = [ c-ares.cmake-config openssl protobuf gflags ]
++ lib.optionals stdenv.isLinux [ libnsl ]; ++ lib.optionals stdenv.isLinux [ libnsl ];
@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
"-DgRPC_SSL_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package"
"-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DCMAKE_CXX_STANDARD=17"
]; ];
# CMake creates a build directory by default, this conflicts with the # CMake creates a build directory by default, this conflicts with the

13
pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
View file

@ -9,17 +9,6 @@ let
rev = "e5b3425575734c323e1d947009dd74709437b684"; rev = "e5b3425575734c323e1d947009dd74709437b684";
sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
}; };
# abseil-cpp in nixpkgs is too old
abseil-cpp_2020923 = abseil-cpp.overrideAttrs (old: rec {
version = "20200923.2";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = version;
sha256 = "G+wkaC4IPtyc/xCUyVFJOcHppPFU7KkhIHjv6uhVKGU=";
};
cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=ON" ];
});
zipcode_rel = "202011"; zipcode_rel = "202011";
jigyosyo = fetchurl { jigyosyo = fetchurl {
url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip"; url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip";
@ -44,7 +33,7 @@ in clangStdenv.mkDerivation rec {
nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ]; nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ];
buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp_2020923 jsoncpp gtest gtk2 ]; buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ];
patches = [ patches = [
# Support linking system abseil-cpp # Support linking system abseil-cpp

4
pkgs/top-level/all-packages.nix
View file

@ -28422,7 +28422,9 @@ in
osi = callPackage ../development/libraries/science/math/osi { }; osi = callPackage ../development/libraries/science/math/osi { };
or-tools = callPackage ../development/libraries/science/math/or-tools { }; or-tools = callPackage ../development/libraries/science/math/or-tools {
abseil-cpp = abseil-cpp.override { static = true; };
};
rubiks = callPackage ../development/libraries/science/math/rubiks { }; rubiks = callPackage ../development/libraries/science/math/rubiks { };