From 99fc94933098646e4c9b0048e7202e62b89d8801 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 26 Jan 2018 16:50:13 +0200
Subject: [PATCH] gcc7: Drop flex again
I think I lost this during merge conflict resolution
---
pkgs/development/compilers/gcc/7/default.nix | 3 +--
1 file changed, 1 insertion(+), 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)