diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 12:54:49 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 12:54:49 +0400 |
| commit | 35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7 (patch) | |
| tree | def4b3c5a7f2ce40a35e14fb2181216f8391c5cd /pkgs/tools/admin/tigervnc | |
| parent | 1375ac9032a89607eee80a4587bc4dd4842dc34b (diff) | |
| parent | 2815cdb8a77c632dacaa9d1d9228af8019d2e4d2 (diff) | |
| download | nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar.gz nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar.bz2 nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar.lz nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar.xz nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.tar.zst nixpkgs-35bf3616085ebc588dea5d3e20e0fcf9f0e58eb7.zip | |
Merge pull request #3615 from bosu/tigervnc-xkb-fix
tigervnc: fix xkb configuration for Xvnc
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 7393336f2be..a7ec73f55d7 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -53,7 +53,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 ''; |