diff options
-rw-r--r-- | pkgs/development/libraries/cxxtest/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 00629339e08..e1898044efa 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchFromGitHub, python2Packages}: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -let +buildPythonApplication rec { pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CxxTest"; @@ -13,16 +11,26 @@ in python2Packages.buildPythonApplication { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - setSourceRoot = '' - sourceRoot=$(echo */python) + sourceRoot = "source/python"; + + postCheck = '' + python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h + $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp + build/GoodSuite + ''; + + postInstall = '' + mkdir -p "$out/include" + cp -r ../cxxtest "$out/include" ''; + dontWrapPythonPrograms = true; + meta = with stdenv.lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; - platforms = platforms.unix ; + platforms = platforms.unix; license = licenses.lgpl3; maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcbbf5f5663..403e934f323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11736,7 +11736,7 @@ in cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; - cxxtest = callPackage ../development/libraries/cxxtest { }; + cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; |