From 51265ae4209c6d604d5f2a3c5e1cfd222297661d Mon Sep 17 00:00:00 2001 From: eymeric Date: Sun, 2 Nov 2025 20:18:09 +0100 Subject: [PATCH 1/2] clang-uml: 0.6.1 -> 0.6.2 --- pkgs/by-name/cl/clang-uml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index 4a0809afe1cd..c4cfb5d045df 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "bkryza"; repo = "clang-uml"; rev = finalAttrs.version; - hash = "sha256-mY6kJnwWLgCeKXSquNTxsnr4S3bKwedgiRixzyLWTK8="; + hash = "sha256-hGjLOyduTc+yOQhO5gDKNfY0fDvbUfvF0FrdjrDheyw="; }; nativeBuildInputs = [ From c5a9d8c4b95203c13ec39f410771d3e332e68f5d Mon Sep 17 00:00:00 2001 From: eymeric Date: Sun, 2 Nov 2025 21:44:19 +0100 Subject: [PATCH 2/2] clang-uml: fix darwin build LibUnwindSetup dep --- .../clang-uml/darwin-system-libunwind.patch | 29 +++++++++++++++++++ pkgs/by-name/cl/clang-uml/package.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/cl/clang-uml/darwin-system-libunwind.patch diff --git a/pkgs/by-name/cl/clang-uml/darwin-system-libunwind.patch b/pkgs/by-name/cl/clang-uml/darwin-system-libunwind.patch new file mode 100644 index 000000000000..181a088f9e6c --- /dev/null +++ b/pkgs/by-name/cl/clang-uml/darwin-system-libunwind.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/LibUnwindSetup.cmake b/cmake/LibUnwindSetup.cmake +index a7cfca9..9f451f4 100644 +--- a/cmake/LibUnwindSetup.cmake ++++ b/cmake/LibUnwindSetup.cmake +@@ -1,22 +1,7 @@ + if(APPLE) + if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + message(STATUS "AppleClang compiler detected: using system libunwind.") +- elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") +- if("${CMAKE_CXX_COMPILER}" MATCHES "/opt/homebrew/") +- set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/unwind") +- message(STATUS "Homebrew Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}") +- elseif("${CMAKE_CXX_COMPILER}" MATCHES "/opt/local/") +- set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/libunwind") +- message(STATUS "MacPorts Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}") +- endif() +- elseif("${CMAKE_CXX_COMPILER}" MATCHES "/usr/local/opt/" OR "${CMAKE_CXX_COMPILER}" MATCHES "/usr/local/Cellar/") +- set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}") +- message(STATUS "Homebrew Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}") +- elseif("${CMAKE_CXX_COMPILER}" MATCHES "/opt/local/") +- set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/libunwind") +- message(STATUS "MacPorts Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}") +- endif() +- set(LIBUNWIND_LIBRARY ${LIBUNWIND_PREFIX}/libunwind.dylib) ++ else() ++ message(STATUS "Using system libunwind (provided by libSystem).") + endif() + endif(APPLE) \ No newline at end of file diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index c4cfb5d045df..fd1871133b14 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hGjLOyduTc+yOQhO5gDKNfY0fDvbUfvF0FrdjrDheyw="; }; + patches = [ + ./darwin-system-libunwind.patch + ]; + nativeBuildInputs = [ cmake pkg-config