diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-11-27 22:02:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-27 22:02:51 -0500 |
| commit | cc28a51bc019b59c4f732efdfe768cb2287734a0 (patch) | |
| tree | 4e417d9bab619e7d08add4390cf707c4ec88fa2d /pkgs/applications/misc | |
| parent | 5cc4f50442d956506b0cbbb487575aa2352984e4 (diff) | |
| parent | 016d6eaa9d6e001c80f642df468037f4359faf40 (diff) | |
| download | nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar.gz nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar.bz2 nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar.lz nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar.xz nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.tar.zst nixpkgs-cc28a51bc019b59c4f732efdfe768cb2287734a0.zip | |
Merge pull request #19818 from KoviRobi/xterm-fix-app-defaults
XTerm: fix app-defaults, fixes menu options
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/xterm/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 8d157d414f8..d01dc120735 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"; |