From 4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 18:45:03 +0100
Subject: [PATCH] gmock: refactor source
---
pkgs/development/libraries/gmock/default.nix | 18 ++++++++++--------
pkgs/development/libraries/gmock/source.nix | 20 --------------------
2 files changed, 10 insertions(+), 28 deletions(-)
delete mode 100644 pkgs/development/libraries/gmock/source.nix
diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
index 23a7ef43625c..926832dbada6 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 c40a7cc5d4da..000000000000
--- 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; };
-}