Merge pull request #19818 from KoviRobi/xterm-fix-app-defaults

XTerm: fix app-defaults, fixes menu options
This commit is contained in:
Graham Christensen 2016-11-27 22:02:51 -05:00 committed by GitHub
commit cc28a51bc0

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
, enableDecLocator ? true
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit
ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper
];
patches = [
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"--enable-luit"
"--enable-mini-luit"
"--with-tty-group=tty"
"--with-app-defaults=$(out)/lib/X11/app-defaults"
] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator";
# Work around broken "plink.sh".
@ -44,6 +45,12 @@ stdenv.mkDerivation rec {
echo '#define USE_UTMP_SETGID 1'
'';
postInstall = ''
for bin in $out/bin/*; do
wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/
done
'';
meta = {
homepage = http://invisible-island.net/xterm;
license = "BSD";