diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-10-03 17:12:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 17:12:59 +0200 |
| commit | 69bb34673e9ce4522f6f5f561fb780a7e46b7a7c (patch) | |
| tree | 5f0686a072ea55c66c3ca39fc5099e4a2eb7cf58 /pkgs/tools/admin | |
| parent | a9cd913b7330e64ab0bdfe46b76de187e00623a8 (diff) | |
| parent | e7ded267bd39f8509c7c4ab2927c6aec9d567540 (diff) | |
| download | nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.gz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.bz2 nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.lz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.xz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.zst nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.zip | |
Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index cac1b9b3c92c..eeefd4d99b5c 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xorg.xkbcomp.crossDrv else xorg.xkbcomp}/bin";' unix/vncserver sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do |