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

gcc7: Drop flex again

Browse Source 
I think I lost this during merge conflict resolution
This commit is contained in:
Tuomas Tynkkynen 2018-01-26 16:50:13 +02:00
parent 6a11ebfae9
commit 99fc949330
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/gcc/7/default.nix
View File

@ -33,7 +33,6 @@
, gnused ? null , gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places , cloog # unused; just for compat with gcc4, as we override the parameter on some places
, darwin ? null , darwin ? null
, flex ? null
, buildPlatform, hostPlatform, targetPlatform , buildPlatform, hostPlatform, targetPlatform
, buildPackages , buildPackages
}: }:
@ -284,7 +283,7 @@ stdenv.mkDerivation ({
]; ];
buildInputs = [ buildInputs = [
gmp mpfr libmpc libelf flex gmp mpfr libmpc libelf
targetPackages.stdenv.cc.bintools # For linking code at run-time targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl) ] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)