diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 15:59:05 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 15:59:05 -0500 |
| commit | f191360ad051fc1bc153fb5193ed14820b99aa84 (patch) | |
| tree | 322ec8fe6301372bb6a95428e3555faf41bdaf5c /pkgs/development/compilers/gcc | |
| parent | 64396d112a5d9c920826c6e035d9fed66b17ac23 (diff) | |
| parent | 06a054e6eb9d5ad395aa89e598205aa2c56afb61 (diff) | |
| download | nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.gz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.bz2 nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.lz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.xz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.zst nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.zip | |
Merge remote-tracking branch 'upstream/staging-next' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b92590aaa165..3ac4fa7032a7 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -9,6 +9,7 @@ , enableShared ? true , enableLTO ? true , texinfo ? null +, flex , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which , libelf # optional, for link-time optimizations (LTO) @@ -108,7 +109,12 @@ stdenv.mkDerivation ({ builder = ../builder.sh; - src = fetchurl { + src = if stdenv.targetPlatform.isVc4 then fetchFromGitHub { + owner = "itszor"; + repo = "gcc-vc4"; + rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918"; + sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8"; + } else fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; }; @@ -173,7 +179,8 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkgconfig) + ++ (optional (stdenv.targetPlatform.isVc4) flex); # For building runtime libs depsBuildTarget = |