diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
| commit | 70babe5bcf383629a6adff3f2874d1b661462146 (patch) | |
| tree | dfbbfa66d02e6ea8fd2d691defcd2307e8f9f16f /pkgs/development/libraries/protobuf | |
| parent | 52cd3538ff0214f0416455322cec299d2a43a436 (diff) | |
| parent | c04a14edd6096a2d55d3b62ca182739dac9b7ede (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/protobuf')
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic-v3.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index f31a7868d5eca..6867940d1f23c 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, buildPackages +, autoreconfHook, zlib, gtest, buildPackages , version, sha256 , ... }: @@ -20,8 +20,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { postPatch = '' rm -rf gmock - cp -r ${gmock.src}/googlemock gmock - cp -r ${gmock.src}/googletest googletest + cp -r ${gtest.src}/googlemock gmock + cp -r ${gtest.src}/googletest googletest chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest |