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

Merge pull request #36515 from xeji/v8-gcc6

Browse Source 
v8: build with gcc6
This commit is contained in:
Jörg Thalheim 2018-03-09 07:47:49 +00:00 committed by GitHub
commit b3064902a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -11595,11 +11595,14 @@ with pkgs;
inherit (python2Packages) python; inherit (python2Packages) python;
}; };
v8 = callPackage ../development/libraries/v8 { v8 = callPackage ../development/libraries/v8 ({
inherit (python2Packages) python gyp; inherit (python2Packages) python gyp;
cctools = darwin.cctools; cctools = darwin.cctools;
icu = icu58; # v8-5.4.232 fails against icu4c-59.1 icu = icu58; # v8-5.4.232 fails against icu4c-59.1
}; } // lib.optionalAttrs stdenv.isLinux {
# doesn't build with gcc7
stdenv = overrideCC stdenv gcc6;
});
v8_static = lowPrio (self.v8.override { static = true; }); v8_static = lowPrio (self.v8.override { static = true; });