terminator: fix build and use buildPythonApplication

1 files changed, 17 insertions, 8 deletions

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 29befb7f25a..79029eb4268 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,19 +1,28 @@
-{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }:
+{ stdenv, fetchurl, python2Packages, pango, keybinder, vte, gettext, intltool, file
+}:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "terminator-${version}";
   version = "0.98";
-  
+
   src = fetchurl {
     url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
     sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
-  
-  propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ];
 
-  #setupPyBuildFlags = [ "--without-icon-cache" ];
+  nativeBuildInputs = [ file intltool ];
+
+  pythonPath = with python2Packages; [
+    pygtk pygobject2 vte keybinder notify gettext pango
+  ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
 
-  doCheck = false;
+  checkPhase = ''
+    ./run_tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Terminal emulator with support for tiling and tabs";
@@ -25,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
     '';
     homepage = http://gnometerminator.blogspot.no/p/introduction.html;
     license = licenses.gpl2;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor globin ];
     platforms = platforms.linux;
   };
 }