terminator: clean up
This commit is contained in:
parent
a57cbb1c36
commit
64c09a3d5c
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, python
|
, python3
|
||||||
, keybinder3
|
, keybinder3
|
||||||
, intltool
|
, intltool
|
||||||
, file
|
, file
|
||||||
|
@ -11,14 +11,14 @@
|
||||||
, vte
|
, vte
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
name = "terminator-${version}";
|
pname = "terminator";
|
||||||
version = "1.92";
|
version = "1.92";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gnome-terminator";
|
owner = "gnome-terminator";
|
||||||
repo = "terminator";
|
repo = "terminator";
|
||||||
rev = "bb24273eb40dc5eac97de74064488701fa40a743";
|
rev = "v${version}";
|
||||||
sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh";
|
sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -34,11 +34,11 @@ python.pkgs.buildPythonApplication rec {
|
||||||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||||
keybinder3
|
keybinder3
|
||||||
libnotify
|
libnotify
|
||||||
python
|
python3
|
||||||
vte
|
vte
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
configobj
|
configobj
|
||||||
dbus-python
|
dbus-python
|
||||||
pygobject3
|
pygobject3
|
||||||
|
@ -47,14 +47,18 @@ python.pkgs.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs run_tests tests po
|
||||||
# dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
|
# dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
|
||||||
# The wrapped terminator has the correct path added, so ignore this.
|
# The wrapped terminator has the correct path added, so ignore this.
|
||||||
substituteInPlace setup.py --replace "'dbus-python'," ""
|
substituteInPlace setup.py --replace "'dbus-python'," ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
./run_tests
|
./run_tests
|
||||||
|
|
||||||
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -22034,7 +22034,7 @@ in
|
||||||
|
|
||||||
terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
|
terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
|
||||||
|
|
||||||
terminator = callPackage ../applications/misc/terminator { python = python3; };
|
terminator = callPackage ../applications/misc/terminator { };
|
||||||
|
|
||||||
terminus = callPackage ../applications/misc/terminus { };
|
terminus = callPackage ../applications/misc/terminus { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue