diff options
Diffstat (limited to 'pkgs/applications/terminal-emulators/terminator/default.nix')
| -rw-r--r-- | pkgs/applications/terminal-emulators/terminator/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 4dee206be28df..aedbb761a8cad 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -7,27 +7,29 @@ , gtk3 , gobject-introspection , libnotify -, wrapGAppsHook +, makeBinaryWrapper +, wrapGAppsHook3 , vte , nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; - rev = "v${version}"; - hash = "sha256-Kx0z9oheA7Ihgsyg6zgPcGFMrqlXoIpQcL/dMqPB2qA="; + rev = "refs/tags/v${version}"; + hash = "sha256-0468d/sAM/UOiaSspwWaOGogoE8/Idth0G4CMCXWFFo="; }; nativeBuildInputs = [ file intltool gobject-introspection - wrapGAppsHook + makeBinaryWrapper + wrapGAppsHook3 python3.pkgs.pytest-runner ]; @@ -55,8 +57,15 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; + # HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the + # terminal session produced by terminator. To avoid this, we force wrapPythonPrograms to only + # use gappsWrapperArgs by redefining wrapProgram to ignore its arguments and only apply the + # wrapper arguments we want it to use. + # TODO: Adjust wrapPythonPrograms to respect an argument that tells it to leave $PATH alone. preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapProgram() { + wrapProgramBinary "$1" "''${gappsWrapperArgs[@]}" + } ''; passthru.tests.test = nixosTests.terminal-emulators.terminator; |