public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33468 from dtzWill/fix/tigervnc

Browse Source 
tigervnc: fix build, build in parallel
This commit is contained in:
Graham Christensen 2018-01-05 21:19:04 -05:00 committed by GitHub
commit d85bac1d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/tigervnc/default.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
--disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
--disable-xorgcfg --disable-xprint --disable-static \ --disable-xorgcfg --disable-xprint --disable-static \
--disable-composite --disable-xtrap --enable-xcsecurity \ --enable-composite --disable-xtrap --enable-xcsecurity \
--disable-{a,c,m}fb \ --disable-{a,c,m}fb \
--disable-xwayland \ --disable-xwayland \
--disable-config-dbus --disable-config-udev --disable-config-hal \ --disable-config-dbus --disable-config-udev --disable-config-hal \
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
--with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
--with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \
--with-xkb-output=$out/share/X11/xkb/compiled --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 popd
''; '';