From 6e2edbff930dbf5b17a23e23f0b563e1db201f5b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Oct 2025 11:53:27 +0300 Subject: [PATCH] flake: only apply the monotonic clocks patch to capnp<1.2.0 1.2.0 already includes it so building on unstable fails. Change-Id: Iefa49203c371e5bab164c06b9da6f89a89ce7cfe --- flake.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 97aea25f9..9ea5dee76 100644 --- a/flake.nix +++ b/flake.nix @@ -262,12 +262,16 @@ }); capnproto = prev.capnproto.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - # backport of https://github.com/capnproto/capnproto/pull/1810 - ./misc/capnproto-promise-nodiscard.patch - # backport of https://github.com/capnproto/capnproto/pull/2296 - ./misc/capnproto-monotonic-clocks-are-a-lie.patch - ]; + patches = + old.patches or [ ] + ++ [ + # backport of https://github.com/capnproto/capnproto/pull/1810 + ./misc/capnproto-promise-nodiscard.patch + ] + ++ lib.optionals (lib.versionOlder old.version "1.2.0") [ + # backport of https://github.com/capnproto/capnproto/pull/2296 + ./misc/capnproto-monotonic-clocks-are-a-lie.patch + ]; }); }; in