From 411ccc6f2c6f5c5badeca661e37dc26ded25aab6 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 8 Mar 2026 12:28:29 +0000
Subject: [PATCH] boost187: move cygwin patch to generic.nix

Since #472755, `boost187.override { patches = ...; }` does not work as expected.
---
 pkgs/development/libraries/boost/1.87.nix    | 10 +---------
 pkgs/development/libraries/boost/generic.nix |  5 ++++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/boost/1.87.nix b/pkgs/development/libraries/boost/1.87.nix
index da981280ee16..0e0db3418496 100644
--- a/pkgs/development/libraries/boost/1.87.nix
+++ b/pkgs/development/libraries/boost/1.87.nix
@@ -1,10 +1,4 @@
-{
-  lib,
-  stdenv,
-  callPackage,
-  fetchurl,
-  ...
-}@args:
+{ callPackage, fetchurl, ... }@args:
 
 callPackage ./generic.nix (
   args
@@ -21,7 +15,5 @@ callPackage ./generic.nix (
       # SHA256 from http://www.boost.org/users/history/version_1_87_0.html
       sha256 = "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89";
     };
-
-    patches = lib.optional stdenv.hostPlatform.isCygwin ./Fix-cygwin-build-187.patch;
   }
 )
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index d8a31321a80c..0c5c41b0eb16 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -255,7 +255,10 @@ stdenv.mkDerivation {
         extraPrefix = "libs/context/";
         hash = "sha256-Z8uw2+4IEybqVcU25i/0XJKS16hi/+3MXUxs53ghjL0=";
       })
-    ];
+    ]
+    ++ lib.optional (
+      stdenv.hostPlatform.isCygwin && lib.versionAtLeast version "1.87" && lib.versionOlder version "1.88"
+    ) ./Fix-cygwin-build-187.patch;
 
   meta = {
     homepage = "http://boost.org/";