nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminator: do not use top-level python packages

Browse Source 
and refactor to use buildPythonApplication. cc @bjornfor
This commit is contained in:
Frederik Rietdijk 2016-09-26 09:47:39 +02:00
parent 93eb9c6428
commit debfe4f124
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/misc/terminator/default.nix
View File

@ -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";

1
pkgs/top-level/all-packages.nix
View File

@ -15191,7 +15191,6 @@ in
terminator = callPackage ../applications/misc/terminator {
vte = gnome2.vte.override { pythonSupport = true; };
inherit (pythonPackages) notify;
};
termite = callPackage ../applications/misc/termite {