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

terminator: don't bleed PATH into session via wrapper

Browse Source 
Fixes: #47290
This commit is contained in:
Elliot Cameron 2024-05-09 17:50:20 -04:00
parent 42a5d29b6f
commit 84d482f423
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/terminal-emulators/terminator/default.nix
View File

@ -7,6 +7,7 @@
, gtk3
, gobject-introspection
, libnotify
, makeBinaryWrapper
, wrapGAppsHook3
, vte
, nixosTests
@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
file
intltool
gobject-introspection
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;