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

2 files changed, 17 insertions, 34 deletions

diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index e516e4a475a3..84b1fa9757ce 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, cmake, callPackage }:
-let
-  source = callPackage ./source.nix { };
-in
+{ stdenv, cmake, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "gtest-${source.version}";
+  name = "gtest-${version}";
+  version = "1.8.0";
 
-  src = source;
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "release-${version}";
+    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+  };
 
   buildInputs = [ cmake ];
 
@@ -17,9 +20,13 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/lib
-    cp -v libgtest.a libgtest_main.a $out/lib
-    cp -v -r ../include $out
-    cp -v -r ../src $out
+    cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
+    ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
+    mkdir -p $out/include
+    cp -v -r ../googlemock/include/gmock $out/include
+    cp -v -r ../googletest/include/gtest $out/include
+    mkdir -p $out/src
+    cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
   '';
 
   meta = with stdenv.lib; {
@@ -27,8 +34,6 @@ stdenv.mkDerivation rec {
     homepage = https://code.google.com/p/googletest/;
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ zoomulator ];
+    maintainers = with maintainers; [ zoomulator ivan-tkatchev ];
   };
-
-  passthru = { inherit source; };
 }
diff --git a/pkgs/development/libraries/gtest/source.nix b/pkgs/development/libraries/gtest/source.nix
deleted file mode 100644
index d8787efdcf2b..000000000000
--- a/pkgs/development/libraries/gtest/source.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchurl, stdenv, unzip, ... }:
-
-stdenv.mkDerivation rec {
-  name = "gtest-src-${version}";
-  version = "1.7.0";
-
-  src = fetchurl {
-    url = "https://googletest.googlecode.com/files/gtest-${version}.zip";
-    sha256 = "03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14";
-  };
-
-  buildInputs = [ unzip ];
-
-  buildCommand = ''
-    unpackPhase
-    cd gtest-${version}
-    mkdir $out
-    cp -r * $out
-  '';
-
-  passthru = { inherit version; };
-}