diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-13 06:47:08 -0800 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-17 08:07:34 +0000 |
| commit | c7e0f6b9050553dfa8dff259a0536326ac43b0ff (patch) | |
| tree | 6862049af64b6ccf9911f5cb54f1651aaf07a182 /pkgs/development/libraries/protobuf | |
| parent | 6a689e72efffde73cc2c6cfa7e142a8d7f8feafd (diff) | |
| download | nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.gz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.bz2 nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.lz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.xz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.zst nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/protobuf')
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 = { |