From 36fed72b3bb7015751af5d06e519a2f55873116b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 24 Sep 2024 00:43:05 +0800 Subject: [PATCH 1/2] opencc: use system rapidjson to fix gcc 14 error The bundled rapidjson is not new enough and causes compilation error[1] in gcc 14. [1]: https://hydra.nixos.org/build/273250179/log --- pkgs/tools/text/opencc/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 5806a8ab4fafe00..fef7fbd9dbbb0c6 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -5,6 +5,7 @@ cmake, python3, opencc, + rapidjson, }: stdenv.mkDerivation rec { @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { opencc # opencc_dict ]; + buildInputs = [ + rapidjson + ]; + + # TODO use more system dependencies + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_RAPIDJSON" true) + ]; + meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; license = licenses.asl20; From 42960d743a87684313e56251bcd97225e60a712d Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 24 Sep 2024 00:51:36 +0800 Subject: [PATCH 2/2] opencc: add passthru.updateScript --- pkgs/tools/text/opencc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index fef7fbd9dbbb0c6..a6e833de76e6de6 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -6,6 +6,7 @@ python3, opencc, rapidjson, + gitUpdater, }: stdenv.mkDerivation rec { @@ -37,6 +38,10 @@ stdenv.mkDerivation rec { (lib.cmakeBool "USE_SYSTEM_RAPIDJSON" true) ]; + passthru = { + updateScript = gitUpdater { rev-prefix = "ver."; }; + }; + meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; license = licenses.asl20;