From debfe4f1246365e02905ca564eaab941c8b56752 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Sep 2016 09:47:39 +0200
Subject: [PATCH] terminator: do not use top-level python packages

and refactor to use buildPythonApplication. cc @bjornfor
---
 pkgs/applications/misc/terminator/default.nix | 19 +++++--------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 7ca5f962403..29befb7f25a 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aee0adf327c..5a720066693 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15191,7 +15191,6 @@ in
 
   terminator = callPackage ../applications/misc/terminator {
     vte = gnome2.vte.override { pythonSupport = true; };
-    inherit (pythonPackages) notify;
   };
 
   termite = callPackage ../applications/misc/termite {