From c379995bb36df56d74dcd942bf5828f09f676e8a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:01:56 +1000 Subject: [PATCH] flex: unconditionally apply patch --- pkgs/development/tools/parsing/flex/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 6721ac53862a..fb1b9a601ac3 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -22,22 +22,20 @@ stdenv.mkDerivation rec { sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"; }; - # Also upstream, will be part of 2.6.5 - # https://github.com/westes/flex/commit/24fd0551333e patches = [ (fetchurl { + # Also upstream, will be part of 2.6.5 + # https://github.com/westes/flex/commit/24fd0551333e name = "glibc-2.26.patch"; url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82ce63f4437b062229d73d90516/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; sha256 = "0mpp41zdg17gx30kcpj83jl8hssks3adbks0qzbhcz882b9c083r"; }) - ] - ++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ (fetchurl { name = "gcc-15.patch"; url = "https://github.com/westes/flex/commit/bf254c75b1e0d2641ebbd7fc85fb183f36a62ea7.patch"; hash = "sha256-Bnv23M2K1Qf7pEaEz0ueSNzTCdjMTDiMm+H7JaxUISs="; }) - ]); + ]; postPatch = '' patchShebangs tests