diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:50:13 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:50:13 +0200 |
| commit | 99fc94933098646e4c9b0048e7202e62b89d8801 (patch) | |
| tree | c955310dded29296b6230cf146ad22962ec07213 /pkgs/development/compilers/gcc/7 | |
| parent | 6a11ebfae93708d8156b11847d3bae6315d5cd4a (diff) | |
| download | nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar.gz nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar.bz2 nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar.lz nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar.xz nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.tar.zst nixlib-99fc94933098646e4c9b0048e7202e62b89d8801.zip | |
gcc7: Drop flex again
I think I lost this during merge conflict resolution
Diffstat (limited to 'pkgs/development/compilers/gcc/7')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 9ce3808b73f2..599441a4744d 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -33,7 +33,6 @@ , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null -, flex ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -284,7 +283,7 @@ stdenv.mkDerivation ({ ]; buildInputs = [ - gmp mpfr libmpc libelf flex + gmp mpfr libmpc libelf targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) |