diff options
| author | tkatchev <tkatchev@gmail.com> | 2017-01-06 23:37:12 +0300 |
|---|---|---|
| committer | tkatchev <tkatchev@gmail.com> | 2017-01-08 00:00:55 +0300 |
| commit | 9c2a222092eeaea15a0d601831381378c1902de3 (patch) | |
| tree | f1ba665757592ba13f8684c0ac5c444ff2f08e66 /pkgs/development/libraries/protobuf | |
| parent | 3dbf6b4a093fc42a2da85fe08daac69973125fae (diff) | |
| download | nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar.gz nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar.bz2 nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar.lz nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar.xz nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.tar.zst nixpkgs-9c2a222092eeaea15a0d601831381378c1902de3.zip | |
gtest, gmock: fix broken package by updating to 1.8.0.
Diffstat (limited to 'pkgs/development/libraries/protobuf')
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic-v3.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/protobuf/generic.nix | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 5a3738564d7..f74aea9dbd5 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -18,8 +18,11 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf gmock - cp -r ${gmock.source} gmock + cp -r ${gmock.src}/googlemock gmock + cp -r ${gmock.src}/googletest googletest chmod -R a+w gmock + chmod -R a+w googletest + ln -s ../googletest gmock/gtest '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 47f66c83ff5..498263458b5 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf gtest - cp -r ${gtest.source} gtest + cp -r ${gtest.src}/googletest gtest chmod -R a+w gtest '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ |