tmux: Inherit MSYSTEM variable

Fixes issue #1183
This commit is contained in:
Niklas Holm 2018-02-28 10:20:07 +01:00
parent b398add4ec
commit f26ddf8e35
2 changed files with 20 additions and 3 deletions

View File

@ -2,7 +2,7 @@
pkgname=tmux
pkgver=2.6
pkgrel=1
pkgrel=2
pkgdesc='A terminal multiplexer'
url='https://tmux.github.io/'
arch=('i686' 'x86_64')
@ -13,16 +13,20 @@ depends=('ncurses' 'libevent')
makedepends=('ncurses-devel' 'libevent-devel')
source=(https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar.gz
'msys-platform.patch'
'no-check-dirs-permission.patch')
'no-check-dirs-permission.patch'
'inherit-msystem-var.patch')
sha256sums=('b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8'
'cf7e0f642d43fc97f7c55be41c693cceab5c891f81fcee687e918075e55cd533'
'8f1938c9bcb99fba5441e11379a193c17eee582a03c04f1bde8089d58a84f44f')
'8f1938c9bcb99fba5441e11379a193c17eee582a03c04f1bde8089d58a84f44f'
'c4dfb160e7aaeef37034868fc4b3083e87588f6f5d69a80a7d5f7d936073a822')
prepare() {
cd "${srcdir}/$pkgname-$pkgver"
patch -p1 -i "${srcdir}"/msys-platform.patch
patch -p0 -i "${srcdir}"/no-check-dirs-permission.patch
patch -p1 -i "${srcdir}"/inherit-msystem-var.patch
cp osdep-cygwin.c osdep-msys.c
#msg2 "Running autogen.sh"

View File

@ -0,0 +1,13 @@
diff --git a/options-table.c b/options-table.c
index f5e973e..29f16f4 100644
--- a/options-table.c
+++ b/options-table.c
@@ -508,7 +508,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SESSION,
.default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID "
- "SSH_CONNECTION WINDOWID XAUTHORITY"
+ "SSH_CONNECTION WINDOWID XAUTHORITY MSYSTEM"
},
{ .name = "visual-activity",