From 2edf41e6bbf1f39beaecc2716463f03e0027a79d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 10:32:40 -0600 Subject: [PATCH 1/2] tigervnc: build in parallel --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 5ba53c75371e..0867a303cae1 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled - make TIGERVNC_SRCDIR=`pwd`/../.. + make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES popd ''; From 30b5b0d48b9701c1db377f3c57581d25f8982859 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 10:34:21 -0600 Subject: [PATCH 2/2] tigervnc: enable composite (required by glx, which we enable) --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 0867a303cae1..e4b206f54488 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-xorgcfg --disable-xprint --disable-static \ - --disable-composite --disable-xtrap --enable-xcsecurity \ + --enable-composite --disable-xtrap --enable-xcsecurity \ --disable-{a,c,m}fb \ --disable-xwayland \ --disable-config-dbus --disable-config-udev --disable-config-hal \