BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15745 from peterhoeg/tmux-env

Browse source 
tmux module: set TMUX_TMPDIR via environment instead of wrapper
This commit is contained in:
Joachim Fasting 2016-05-27 13:23:48 +02:00
commit a487cacef4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/programs/tmux.nix
View file

@ -156,8 +156,13 @@ in {
config = mkIf cfg.enable {
environment = {
systemPackages = [ pkgs.tmux ];
etc."tmux.conf".text = tmuxConf;
systemPackages = [ pkgs.tmux ];
variables = {
TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
};
};
};
}

3
pkgs/tools/misc/tmux/default.nix
View file

@ -34,9 +34,6 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/bash-completion/completions
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 = {