From 1a6e4d1627411b6a90cb33e00faecac286f4acf1 Mon Sep 17 00:00:00 2001 From: dramforever Date: Sat, 11 Oct 2025 11:32:29 +0800 Subject: [PATCH] cxxopts: Unpin icu, fix build Set -DCXXOPTS_CXX_STANDARD=17 while building to avoid icu-related error. This is supported by cxxopts and included in their testing [1]. The build just *defaults* to C++11, which icu >= 75 no longer supports. [1]: https://github.com/jarro2783/cxxopts/commit/76bd60dc17ca514f2febb49382b38d526d5502a5 --- pkgs/by-name/cx/cxxopts/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix index 8accbcad0630..1458ecde75c2 100644 --- a/pkgs/by-name/cx/cxxopts/package.nix +++ b/pkgs/by-name/cx/cxxopts/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch2, cmake, - icu74, + icu, pkg-config, testers, validatePkgConfig, @@ -22,9 +22,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4="; }; - propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ]; + propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" + "-DCXXOPTS_CXX_STANDARD=17" ] ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"; nativeBuildInputs = [