From 016d6eaa9d6e001c80f642df468037f4359faf40 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 24 Oct 2016 11:00:07 +0100 Subject: [PATCH] XTerm: fix app-defaults, fixes menu options --- pkgs/applications/misc/xterm/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index adc0c3c9fb6..6a9dc386be1 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -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";