gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-uml: fix build on linux and darwin (#457905)

Browse Source
This commit is contained in:
Aleksana
2025-11-14 10:16:56 +00:00
committed by GitHub
parent fa972b1d29 c5a9d8c4b9
commit fbf1b24625
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/cl/clang-uml/darwin-system-libunwind.patch
+29
View File
@@ -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)
pkgs/by-name/cl/clang-uml/package.nix
+6 -2
View File
@@ -17,15 +17,19 @@
}:
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=";
};
patches = [
./darwin-system-libunwind.patch
];
nativeBuildInputs = [
cmake
pkg-config