summary refs log tree commit diff
path: root/pkgs/tools/admin/tigervnc
diff options
context:
space:
mode:
authorBoris Sukholitko <boriss@gmail.com>2014-08-15 17:51:50 +0300
committerBoris Sukholitko <boriss@gmail.com>2014-08-15 17:51:50 +0300
commit2815cdb8a77c632dacaa9d1d9228af8019d2e4d2 (patch)
tree927545ceccd1d3cf60fb720b23eea7db06634d92 /pkgs/tools/admin/tigervnc
parent3b12f59eada47fa3f4bf54ed69282ee879d5ded1 (diff)
downloadnixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar.gz
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar.bz2
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar.lz
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar.xz
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.tar.zst
nixpkgs-2815cdb8a77c632dacaa9d1d9228af8019d2e4d2.zip
tigervnc: fix xkb configuration for Xvnc
Without those fixes, Xvnc doesn't work at all.
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
-rw-r--r--pkgs/tools/admin/tigervnc/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3d5abd074d9..71e1f29cf1c 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -57,7 +57,12 @@ stdenv.mkDerivation rec {
       patch -p1 < $a
     done
     autoreconf -vfi
-    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests
+    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest \
+        --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
+        --prefix="$out" --disable-unit-tests \
+        --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
+        --with-xkb-bin-directory=${xkbcomp}/bin \
+        --with-xkb-output=$out/share/X11/xkb/compiled
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';