diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 37c999e86b4c..9ff1094aec13 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -1,31 +1,40 @@
-{ stdenv
-, buildPythonPackage
-, fetchhg
-, pkgs
-, isPy3k
-}:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }:
 
 buildPythonPackage rec {
-  version = "20101207";
   pname = "pivy";
-  disabled = isPy3k; # Judging from SyntaxError
+  version = "0.6.5a2";
 
-  src = fetchhg {
-    url = "https://bitbucket.org/Coin3D/pivy";
-    rev = "8eab90908f2a3adcc414347566f4434636202344";
-    sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
+  src = fetchFromGitHub {
+    owner = "FreeCAD";
+    repo = "pivy";
+    rev = version;
+    sha256 = "1w03jaha36bjyfaz8hchnv8yrkm5715w15crhd3qrlagz8fs38hm";
   };
 
   nativeBuildInputs = with pkgs; [
-    swig1 coin3d soqt
+    swig qt5.qmake cmake
   ];
 
   buildInputs = with pkgs; with xorg; [
-    coin3d soqt
+    coin3d soqt qt5.qtbase
     libGLU_combined
     libXi libXext libSM libICE libX11
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    "-I${pkgs.qt5.qtbase.dev}/include/QtCore"
+    "-I${pkgs.qt5.qtbase.dev}/include/QtGui"
+    "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL"
+    "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets"
+  ];
+
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
+      \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://pivy.coin3d.org/;
     description = "A Python binding for Coin";