terminator: do not use top-level python packages

and refactor to use buildPythonApplication. cc @bjornfor

1 files changed, 5 insertions, 14 deletions

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 7ca5f962403cc..29befb7f25a8c 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool
-, makeWrapper
-}:
+{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }:
 
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   name = "terminator-${version}";
   version = "0.98";
   
@@ -11,18 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
   
-  buildInputs = [
-    python pygtk notify keybinder vte gettext intltool makeWrapper
-  ];
+  propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ];
 
-  installPhase = ''
-    python setup.py --without-icon-cache install --prefix="$out"
+  #setupPyBuildFlags = [ "--without-icon-cache" ];
 
-    for file in "$out"/bin/*; do
-        wrapProgram "$file" \
-            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
-    done
-  '';
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Terminal emulator with support for tiling and tabs";