forked from mirrors/nixpkgs
tmux module: set TMUX_TMPDIR via environment instead of wrapper
This commit is contained in:
parent
e746e1ffbc
commit
5404595b55
|
@ -156,8 +156,13 @@ in {
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = [ pkgs.tmux ];
|
|
||||||
etc."tmux.conf".text = tmuxConf;
|
etc."tmux.conf".text = tmuxConf;
|
||||||
|
|
||||||
|
systemPackages = [ pkgs.tmux ];
|
||||||
|
|
||||||
|
variables = {
|
||||||
|
TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,9 +34,6 @@ stdenv.mkDerivation rec {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/share/bash-completion/completions
|
mkdir -p $out/share/bash-completion/completions
|
||||||
cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux
|
cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux
|
||||||
|
|
||||||
wrapProgram $out/bin/tmux \
|
|
||||||
--set TMUX_TMPDIR \''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
Loading…
Reference in a new issue