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

XTerm: fix app-defaults, fixes menu options

authored by Graham Christensen and committed by GitHub cc28a51b 5cc4f504

+9 -2
+9 -2
pkgs/applications/misc/xterm/default.nix
··· 1 - { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig 1 + { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper 2 2 , enableDecLocator ? true 3 3 }: 4 4 ··· 12 12 13 13 buildInputs = 14 14 [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE 15 - ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit 15 + ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper 16 16 ]; 17 17 18 18 patches = [ ··· 30 30 "--enable-luit" 31 31 "--enable-mini-luit" 32 32 "--with-tty-group=tty" 33 + "--with-app-defaults=$(out)/lib/X11/app-defaults" 33 34 ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; 34 35 35 36 # Work around broken "plink.sh". ··· 42 43 # groups, and the builder will end up removing any setgid. 43 44 postConfigure = '' 44 45 echo '#define USE_UTMP_SETGID 1' 46 + ''; 47 + 48 + postInstall = '' 49 + for bin in $out/bin/*; do 50 + wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/ 51 + done 45 52 ''; 46 53 47 54 meta = {