public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtest, gmock: fix broken package by updating to 1.8.0.

Browse Source
This commit is contained in:
tkatchev
2017-01-06 23:37:12 +03:00
parent 3dbf6b4a09
commit 9c2a222092
6 changed files with 23 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@@ -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"'

2
pkgs/development/libraries/protobuf/generic.nix
View File

@@ -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 \