From 510b86f38786569119a9cd8388fcb5126a22718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Sep 2012 15:53:07 +0200 Subject: [PATCH] libreoffice: trying to enable parallel building I use the nix approach about the number of cores, as enableParallelBuilding. --- pkgs/applications/office/openoffice/libreoffice.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index b45ac5dd309f..d336266ccaf1 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of + # enableParallelBuilding=true in this build system. preConfigure = '' # Needed to find genccode PATH=$PATH:${icu}/sbin - configureFlagsArray=("--with-lang=${langsSpaces}") + configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES") ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -117,7 +119,6 @@ stdenv.mkDerivation rec { configureFlags = [ #"--enable-verbose" - "--with-max-jobs=1" "--with-num-cpus=1" # Without these, configure does not finish "--without-junit"