diff options
| author | Alexander Ried <ried@mytum.de> | 2016-10-03 14:28:56 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-03 15:03:02 +0200 |
| commit | e7ded267bd39f8509c7c4ab2927c6aec9d567540 (patch) | |
| tree | 7b5182443ade183f2b8bc4b6259e007c515e0cfa /pkgs/tools/admin/tigervnc | |
| parent | 98e2b90cf382e3323f7f5d7b9dcc808099e53685 (diff) | |
| download | nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.gz nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.bz2 nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.lz nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.xz nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.zst nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.zip | |
xserver: replace XKB_BINDIR with compile time option
--- Using the configure option relieves us of the patch and passing the path via the env var in many places. Also the env var may not be inherited when components like gdm spawn new sessions.
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
| -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 cac1b9b3c92..eeefd4d99b5 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 |