From d9054c25ce560098a625f83a0815ed631826b795 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 21 Oct 2024 18:04:07 +0800 Subject: [PATCH] clang-uml: fix build --- pkgs/by-name/cl/clang-uml/package.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index da5608e6f168a..adc180a4c1ce1 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -6,7 +6,6 @@ pkg-config, installShellFiles, libclang, - clang, llvmPackages, libllvm, yaml-cpp, @@ -42,8 +41,11 @@ stdenv.mkDerivation (finalAttrs: { [ ] ); + cmakeFlags = [ + "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare" + ]; + buildInputs = [ - clang libclang libllvm yaml-cpp @@ -70,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = debug; dontStrip = debug; - meta = with lib; { + meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; longDescription = '' clang-uml is an automatic C++ to UML class, sequence, package and include diagram generator, driven by YAML configuration files. @@ -78,9 +80,9 @@ stdenv.mkDerivation (finalAttrs: { The configuration file or files for clang-uml define the types and contents of each generated diagram. The diagrams can be generated in PlantUML, MermaidJS and JSON formats. ''; - maintainers = with maintainers; [ eymeric ]; + maintainers = with lib.maintainers; [ eymeric ]; homepage = "https://clang-uml.github.io/"; - license = licenses.asl20; - platforms = platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe8240..376c18b52567d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -444,6 +444,10 @@ with pkgs; circt = callPackage ../development/compilers/circt { }; + clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { + stdenv = clangStdenv; + }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { };