diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index e0895bab68d8..58f0bb54fb1a 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,7 +1,11 @@ { lib, stdenv, buildPackages, fetchurl, bison, m4 -, fetchpatch, autoreconfHook, help2man +, autoreconfHook, help2man }: +# Avoid 'fetchpatch' to allow 'flex' to be used as a possible 'gcc' +# dependency during bootstrap. Useful when gcc is built from snapshot +# or from a git tree (flex lexers are not pre-generated there). + stdenv.mkDerivation rec { pname = "flex"; version = "2.6.4"; @@ -13,11 +17,10 @@ stdenv.mkDerivation rec { # Also upstream, will be part of 2.6.5 # https://github.com/westes/flex/commit/24fd0551333e - patches = [(fetchpatch { + patches = [(fetchurl { name = "glibc-2.26.patch"; - url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82c" - + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; - sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; + url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82ce63f4437b062229d73d90516/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; + sha256 = "0mpp41zdg17gx30kcpj83jl8hssks3adbks0qzbhcz882b9c083r"; })]; postPatch = ''