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

libphonenumber: fix cross-compilation

Browse Source 
The following previously failed and now succeeds.

    nix-build -A pkgsCross.aarch64-multiplatform.libphonenumber .

When compiling natively, the result is the same as before.
This commit is contained in:
Ewout Van Troostenberghe 2022-09-23 21:24:14 +02:00 committed by Rick van Schijndel
parent d8218497d3
commit d8be1b011f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libphonenumber/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation }:
{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation, buildPackages }:
stdenv.mkDerivation rec {
pname = "phonenumber";
@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
gtest
pkg-config
];
@ -21,9 +20,15 @@ stdenv.mkDerivation rec {
boost
protobuf
icu
gtest
] ++ lib.optional stdenv.isDarwin Foundation;
cmakeDir = "../cpp";
cmakeFlags =
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DBUILD_GEOCODER=OFF"
"-DPROTOC_BIN=${buildPackages.protobuf}/bin/protoc"
];
checkPhase = "./libphonenumber_test";