Skip to content

Commit

Permalink
chromium: Enable parallel building.
Browse files Browse the repository at this point in the history
Always did this manually by putting -j8 into make flags, which i didn't commit,
as it obviously doesn't make sense to hardcode. However, this flag makes more
sense and obviously we need to avoid overriding buildPhase.
  • Loading branch information
aszlig authored and edolstra committed Jun 22, 2012
1 parent 59f8de8 commit d23dcbb
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions pkgs/applications/networking/browsers/chromium/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,28 @@ in stdenv.mkDerivation rec {

buildType = "Release";

enableParallelBuilding = true;

configurePhase = ''
python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
'';

extraBuildFlags = let
makeFlags = let
CC = "${gcc}/bin/gcc";
CXX = "${gcc}/bin/g++";
in "CC=\"${CC}\" CXX=\"${CXX}\" CC.host=\"${CC}\" CXX.host=\"${CXX}\" LINK.host=\"${CXX}\"";
in [
"CC=${CC}"
"CXX=${CXX}"
"CC.host=${CC}"
"CXX.host=${CXX}"
"LINK.host=${CXX}"
];

buildPhase = ''
make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome
'';
buildFlags = [
"BUILDTYPE=${buildType}"
"library=shared_library"
"chrome"
];

installPhase = ''
mkdir -vp "$out/libexec/${packageName}"
Expand Down

0 comments on commit d23dcbb

Please sign in to comment.