2 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 3469cda3fc7..3b8d470d17f 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonApplication, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cxxtest";
   version = "4.4";
 
@@ -13,15 +13,26 @@ buildPythonApplication rec {
 
   sourceRoot = "source/python";
 
+  checkInputs = [ python3Packages.ply ];
+
+  preCheck = ''
+    cd ../
+  '';
+
   postCheck = ''
-    python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h
-    $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp
+    cd python3
+    python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../../test/GoodSuite.h
+    $CXX -I../../ -o build/GoodSuite build/GoodSuite.cpp
     build/GoodSuite
   '';
 
+  preInstall = ''
+    cd python3
+  '';
+
   postInstall = ''
     mkdir -p "$out/include"
-    cp -r ../cxxtest "$out/include"
+    cp -r ../../cxxtest "$out/include"
   '';
 
   dontWrapPythonPrograms = true;
@@ -29,8 +40,8 @@ buildPythonApplication rec {
   meta = with lib; {
     homepage = "http://cxxtest.com";
     description = "Unit testing framework for C++";
-    platforms = platforms.unix;
     license = licenses.lgpl3;
-    maintainers = [ maintainers.juliendehos ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ juliendehos ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 225b1b7818b..f66b2c20043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18300,7 +18300,7 @@ with pkgs;
 
   cxxopts = callPackage ../development/libraries/cxxopts { };
 
-  cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { };
+  cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
 
   cypress = callPackage ../development/web/cypress { };