Skip to content

Commit

Permalink
google-cloud-sdk: fix Darwin build by only stripping local symbols (#…
Browse files Browse the repository at this point in the history
…80554)

Darwin won't strip relocatable symbols, so strip only local symbols
from cygrpc.so

See also 6ceebc4#commitcomment-37355193

(cherry picked from commit 9b8a14b)
  • Loading branch information
honkfestival authored and zimbatm committed Feb 21, 2020
1 parent 07f20d0 commit d10a014
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/tools/admin/google-cloud-sdk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ let
};
}.${system};

strip = if stdenv.isDarwin then "strip -x" else "strip";

in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "268.0.0";
Expand Down Expand Up @@ -93,7 +95,7 @@ in stdenv.mkDerivation rec {
done
# strip the Cython gRPC library
strip $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
'';

meta = with stdenv.lib; {
Expand Down

0 comments on commit d10a014

Please sign in to comment.