diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix index 23a7ef43625..926832dbada 100644 --- a/pkgs/development/libraries/gmock/default.nix +++ b/pkgs/development/libraries/gmock/default.nix @@ -1,11 +1,13 @@ -{ stdenv, cmake, callPackage }: -let - source = callPackage ./source.nix { }; -in -stdenv.mkDerivation rec { - name = "gmock-${source.version}"; +{ stdenv, cmake, fetchzip }: - src = source; +stdenv.mkDerivation rec { + name = "gmock-${version}"; + version = "1.7.0"; + + src = fetchzip { + url = "https://googlemock.googlecode.com/files/gmock-${version}.zip"; + sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz"; + }; buildInputs = [ cmake ]; @@ -28,5 +30,5 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.auntie ]; }; - passthru = { inherit source; }; + passthru = { source = src; }; } diff --git a/pkgs/development/libraries/gmock/source.nix b/pkgs/development/libraries/gmock/source.nix deleted file mode 100644 index c40a7cc5d4d..00000000000 --- a/pkgs/development/libraries/gmock/source.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchzip, stdenv, unzip, ... }: - -stdenv.mkDerivation rec { - name = "gmock-src-${version}"; - version = "1.7.0"; - - src = fetchzip { - url = "https://googlemock.googlecode.com/files/gmock-${version}.zip"; - sha256="04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz"; - }; - - buildInputs = [ unzip ]; - - installPhase = '' - mkdir $out - cp -r * $out - ''; - - passthru = { inherit version; }; -}