MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chromium: Clean up build flags.

Browse source 
This also includes setting compiler architectures and paths.
This commit is contained in:
aszlig 2012-06-15 11:06:07 +02:00 committed by Eelco Dolstra
parent dc32b4caef
commit 2571488e6a
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -47,14 +47,20 @@ in stdenv.mkDerivation rec {
prePatch = "patchShebangs .";
gypFlags = mkGypFlags {
gypFlags = mkGypFlags ({
linux_use_gold_binary = false;
linux_use_gold_flags = false;
proprietary_codecs = false;
use_gnome_keyring = gnomeKeyringSupport;
disable_nacl = !naclSupport;
use_cups = false;
};
} // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") {
target_arch = "x64";
} // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") {
target_arch = "ia32";
});
buildType = "Release";
/* TODO:
use_system_bzip2 = true;
@ -80,11 +86,16 @@ in stdenv.mkDerivation rec {
*/
configurePhase = ''
python build/gyp_chromium --depth $(pwd) ${gypFlags}
python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
'';
extraBuildFlags = let
CC = "${gcc}/bin/gcc";
CXX = "${gcc}/bin/g++";
in "CC=\"${CC}\" CXX=\"${CXX}\" CC.host=\"${CC}\" CXX.host=\"${CXX}\" LINK.host=\"${CXX}\"";
buildPhase = ''
make CC=${gcc}/bin/gcc BUILDTYPE=Release library=shared_library chrome chrome_sandbox
make ${extraBuildFlags} BUILDTYPE=${buildType} library=shared_library chrome chrome_sandbox
'';
installPhase = ''