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

libreoffice: trying to enable parallel building 

I use the nix approach about the number of cores, as enableParallelBuilding.
This commit is contained in:
Lluís Batlle i Rossell 2012-09-03 15:53:07 +02:00
parent a683b2f6b4
commit 510b86f387
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/office/openoffice/libreoffice.nix
View File

@ -83,11 +83,13 @@ stdenv.mkDerivation rec {
QT4DIR = qt4; QT4DIR = qt4;
KDE4DIR = kde4.kdelibs; KDE4DIR = kde4.kdelibs;
# I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of
# enableParallelBuilding=true in this build system.
preConfigure = '' preConfigure = ''
# Needed to find genccode # Needed to find genccode
PATH=$PATH:${icu}/sbin PATH=$PATH:${icu}/sbin
configureFlagsArray=("--with-lang=${langsSpaces}") configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES")
''; '';
makeFlags = "SHELL=${bash}/bin/bash"; makeFlags = "SHELL=${bash}/bin/bash";
@ -117,7 +119,6 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
#"--enable-verbose" #"--enable-verbose"
"--with-max-jobs=1" "--with-num-cpus=1"
# Without these, configure does not finish # Without these, configure does not finish
"--without-junit" "--without-junit"