From c7e0f6b9050553dfa8dff259a0536326ac43b0ff Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 13 Nov 2023 06:47:08 -0800 Subject: treewide: s_targetPlatform_hostPlatform_ in non-compiler packages stdenv.targetPlatform really shouldn't be used by software that doesn't generate or manipulate binaries. I reviewed all uses of targetPlatform outside of pkgs/development/compilers and pkgs/stdenv and replaced those which weren't involved in something which fits these criteria. --- pkgs/development/libraries/protobuf/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/protobuf') diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index bcef33b0caf..cf00d1d50be 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ] # Tests fail to build on 32-bit platforms; fixed in 22.x # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "22") [ + ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ "-Dprotobuf_BUILD_TESTS=OFF" ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { # https://hydra.nixos.org/build/235677717/nixlog/4/tail # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.targetPlatform.is32bit; + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { -- cgit 1.4.1