libphonenumber: 9.0.10 -> 9.0.12 (#430854)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
buildPackages,
|
||||
cmake,
|
||||
enableTests ? true,
|
||||
gtest,
|
||||
jre,
|
||||
pkg-config,
|
||||
@@ -14,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.10";
|
||||
version = "9.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b/TQhHG7qPzXcFtiFNXOu1hkFfT9KnZNPa+AB/Fmk0E=";
|
||||
hash = "sha256-ylEv1YtnzXGHLKVY1INEq2GXrxgfy6R0cL199ec8CyQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -31,27 +32,36 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals enableTests [
|
||||
gtest
|
||||
jre
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
icu
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals enableTests [
|
||||
boost
|
||||
];
|
||||
|
||||
cmakeDir = "../cpp";
|
||||
|
||||
doCheck = true;
|
||||
doCheck = enableTests;
|
||||
|
||||
checkTarget = "tests";
|
||||
|
||||
cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
(lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
|
||||
(lib.cmakeFeature "PROTOC_BIN" (lib.getExe buildPackages.protobuf))
|
||||
];
|
||||
cmakeFlags =
|
||||
lib.optionals (!enableTests) [
|
||||
(lib.cmakeBool "REGENERATE_METADATA" false)
|
||||
(lib.cmakeBool "USE_BOOST" false)
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
(lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
|
||||
(lib.cmakeFeature "PROTOC_BIN" (lib.getExe buildPackages.protobuf))
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/google/libphonenumber/blob/${finalAttrs.src.rev}/release_notes.txt";
|
||||
|
||||
Reference in New Issue
Block a user