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

chromium: Clean up/remove old/unused stuff.

Browse Source 
We no longer need to supply compiler and binutils to the build process,
se we can safely remove them. In addition, we're now passing the new
options linux_use_gold_binary and linux_use_bundled_gold to gyp, for
details, see:

https://codereview.chromium.org/239163003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-08-13 04:53:31 +02:00
parent 1f3af28e8a
commit f4a9d3c0d0
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -10,7 +10,7 @@
, python, pythonPackages, perl, pkgconfig , python, pythonPackages, perl, pkgconfig
, nspr, udev, krb5 , nspr, udev, krb5
, utillinux, alsaLib , utillinux, alsaLib
, gcc, bison, gperf , bison, gperf
, glib, gtk, dbus_glib , glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, libXtst, mesa , libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage , protobuf, speechd, libXdamage
@ -145,6 +145,8 @@ let
''; '';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
linux_use_bundled_binutils = false;
linux_use_bundled_gold = false;
linux_use_gold_binary = false; linux_use_gold_binary = false;
linux_use_gold_flags = false; linux_use_gold_flags = false;
proprietary_codecs = false; proprietary_codecs = false;
@ -192,20 +194,15 @@ let
''; '';
buildPhase = let buildPhase = let
CC = "${gcc}/bin/gcc";
CXX = "${gcc}/bin/g++";
buildCommand = target: let buildCommand = target: let
# XXX: Only needed for version 36 and older! # XXX: Only needed for version 36 and older!
targetSuffix = optionalString targetSuffix = optionalString
(versionOlder source.version "37.0.0.0" && target == "mksnapshot") (versionOlder source.version "37.0.0.0" && target == "mksnapshot")
(if stdenv.is64bit then ".x64" else ".ia32"); (if stdenv.is64bit then ".x64" else ".ia32");
in '' in ''
CC="${CC}" CC_host="${CC}" \ "${ninja}/bin/ninja" -C "${buildPath}" \
CXX="${CXX}" CXX_host="${CXX}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
LINK_host="${CXX}" \ "${target}${targetSuffix}"
"${ninja}/bin/ninja" -C "${buildPath}" \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
"${target}${targetSuffix}"
'' + optionalString (target == "mksnapshot" || target == "chrome") '' '' + optionalString (target == "mksnapshot" || target == "chrome") ''
paxmark m "${buildPath}/${target}${targetSuffix}" paxmark m "${buildPath}/${target}${targetSuffix}"
''; '';