mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge pull request #19818 from KoviRobi/xterm-fix-app-defaults
XTerm: fix app-defaults, fixes menu options
This commit is contained in:
commit
cc28a51bc0
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig
|
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
|
||||||
, enableDecLocator ? true
|
, enableDecLocator ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
|
[ 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 = [
|
patches = [
|
||||||
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||||||
"--enable-luit"
|
"--enable-luit"
|
||||||
"--enable-mini-luit"
|
"--enable-mini-luit"
|
||||||
"--with-tty-group=tty"
|
"--with-tty-group=tty"
|
||||||
|
"--with-app-defaults=$(out)/lib/X11/app-defaults"
|
||||||
] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator";
|
] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator";
|
||||||
|
|
||||||
# Work around broken "plink.sh".
|
# Work around broken "plink.sh".
|
||||||
@ -44,6 +45,12 @@ stdenv.mkDerivation rec {
|
|||||||
echo '#define USE_UTMP_SETGID 1'
|
echo '#define USE_UTMP_SETGID 1'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
for bin in $out/bin/*; do
|
||||||
|
wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://invisible-island.net/xterm;
|
homepage = http://invisible-island.net/xterm;
|
||||||
license = "BSD";
|
license = "BSD";
|
||||||
|
Loading…
Reference in New Issue
Block a user