diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 18:45:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 18:45:03 +0100 |
| commit | 4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71 (patch) | |
| tree | b6c3b665d21217049418e04b8917bb0ad0e55964 /pkgs/development/libraries | |
| parent | 352ff0be29e9f2784a94bcac4b853703eebca6fc (diff) | |
| download | nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar.gz nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar.bz2 nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar.lz nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar.xz nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.tar.zst nixpkgs-4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71.zip | |
gmock: refactor source
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gmock/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmock/source.nix | 20 |
2 files changed, 9 insertions, 27 deletions
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, cmake, fetchzip }: + stdenv.mkDerivation rec { - name = "gmock-${source.version}"; + name = "gmock-${version}"; + version = "1.7.0"; - src = source; + 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; }; -} |