terminator: do not use top-level python packages

and refactor to use buildPythonApplication. cc @bjornfor

+5 -15
+5 -14
pkgs/applications/misc/terminator/default.nix
··· 1 - { stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool 2 - , makeWrapper 3 - }: 1 + { stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }: 4 2 5 - stdenv.mkDerivation rec { 3 + pythonPackages.buildPythonApplication rec { 6 4 name = "terminator-${version}"; 7 5 version = "0.98"; 8 6 ··· 11 9 sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a"; 12 10 }; 13 11 14 - buildInputs = [ 15 - python pygtk notify keybinder vte gettext intltool makeWrapper 16 - ]; 12 + propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ]; 17 13 18 - installPhase = '' 19 - python setup.py --without-icon-cache install --prefix="$out" 14 + #setupPyBuildFlags = [ "--without-icon-cache" ]; 20 15 21 - for file in "$out"/bin/*; do 22 - wrapProgram "$file" \ 23 - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" 24 - done 25 - ''; 16 + doCheck = false; 26 17 27 18 meta = with stdenv.lib; { 28 19 description = "Terminal emulator with support for tiling and tabs";
-1
pkgs/top-level/all-packages.nix
··· 15191 15191 15192 15192 terminator = callPackage ../applications/misc/terminator { 15193 15193 vte = gnome2.vte.override { pythonSupport = true; }; 15194 - inherit (pythonPackages) notify; 15195 15194 }; 15196 15195 15197 15196 termite = callPackage ../applications/misc/termite {