From f9dcf13b6e435d1738dea4e2fe29d24f0862dc71 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Feb 2015 12:05:11 -0800 Subject: gtest: Modularize out the source files into a derivation --- pkgs/development/libraries/gtest/default.nix | 19 +++++++++---------- pkgs/development/libraries/gtest/source.nix | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/gtest/source.nix (limited to 'pkgs/development/libraries/gtest') diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index d71c29cbca5..e516e4a475a 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,15 +1,13 @@ -{ stdenv, fetchurl, unzip, cmake}: - +{ stdenv, cmake, callPackage }: +let + source = callPackage ./source.nix { }; +in stdenv.mkDerivation rec { - version = "1.7.0"; - name = "gtest-${version}"; + name = "gtest-${source.version}"; - src = fetchurl { - url = "https://googletest.googlecode.com/files/${name}.zip"; - sha256="03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14"; - }; + src = source; - buildInputs = [ unzip cmake ]; + buildInputs = [ cmake ]; configurePhase = '' mkdir build @@ -31,5 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ zoomulator ]; }; -} + passthru = { inherit source; }; +} diff --git a/pkgs/development/libraries/gtest/source.nix b/pkgs/development/libraries/gtest/source.nix new file mode 100644 index 00000000000..d8787efdcf2 --- /dev/null +++ b/pkgs/development/libraries/gtest/source.nix @@ -0,0 +1,22 @@ +{ 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; }; +} -- cgit 1.4.1