b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge #215050: protobuf3_21: don't build tests on 32-bit platforms

Browse source
This commit is contained in:
Vladimír Čunát 2023-02-12 13:29:10 +01:00
parent 3f5d1307e9 025b08b580
commit 674e3f033c
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/protobuf/generic-v3-cmake.nix
View file

@ -79,7 +79,12 @@ let
"-Dprotobuf_ABSL_PROVIDER=package"
] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [
"-Dprotobuf_BUILD_SHARED_LIBS=ON"
];
]
# Tests fail to build on 32-bit platforms; fixed in 3.22
# https://github.com/protocolbuffers/protobuf/issues/10418
++ lib.optional
(stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22")
"-Dprotobuf_BUILD_TESTS=OFF";
# unfortunately the shared libraries have yet to been patched by nix, thus tests will fail
doCheck = false;

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

@ -22725,13 +22725,7 @@ with pkgs;
prospector = callPackage ../development/tools/prospector { };
# https://github.com/protocolbuffers/protobuf/issues/10418
# protobuf versions have to match between build-time and run-time
# Using "targetPlatform" in the check makes sure that the version of
# pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the
# version of pkgsCross.armv7l-hf-multiplatform.protobuf
protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else
protobuf3_21;
protobuf = protobuf3_21;
protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { };
protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { };