diff options
| author | thomasjm <tom@codedown.io> | 2023-04-16 23:14:26 -0700 |
|---|---|---|
| committer | thomasjm <tom@codedown.io> | 2023-04-16 23:14:26 -0700 |
| commit | fe00f3f4620b28297667403fe7e11ea9c56138cb (patch) | |
| tree | 5b3b180f243e4de65e8fdfee0867346e141ed6a4 /pkgs/development/interpreters/cling | |
| parent | cfb1293342612966c12a4ed5928ef0005fa0e013 (diff) | |
Force installation of ClingTargets.cmake
Diffstat (limited to 'pkgs/development/interpreters/cling')
| -rw-r--r-- | pkgs/development/interpreters/cling/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/cling/force-install-cling-targets.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index b09faa63ef2a9..645b8e10e4c7e 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -53,6 +53,8 @@ let # https://github.com/root-project/root/commit/286d96b12aad8688b9d8e4b3b5df843dcfb716a8 ./fix-llvm-dylib-usage.patch + + ./force-install-cling-targets.patch ]; nativeBuildInputs = [ python3 git cmake ]; diff --git a/pkgs/development/interpreters/cling/force-install-cling-targets.patch b/pkgs/development/interpreters/cling/force-install-cling-targets.patch new file mode 100644 index 0000000000000..627e2593298e1 --- /dev/null +++ b/pkgs/development/interpreters/cling/force-install-cling-targets.patch @@ -0,0 +1,16 @@ +diff --git a/tools/cling/cmake/modules/CMakeLists.txt b/tools/cling/cmake/modules/CMakeLists.txt +--- a/tools/cling/cmake/modules/CMakeLists.txt ++++ b/tools/cling/cmake/modules/CMakeLists.txt +@@ -54,10 +54,8 @@ set(CLING_CONFIG_EXPORTS_FILE) + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + get_property(cling_has_exports GLOBAL PROPERTY CLING_HAS_EXPORTS) +- if(cling_has_exports) +- install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} +- COMPONENT cling-cmake-exports) +- endif() ++ install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} ++ COMPONENT cling-cmake-exports) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClingConfig.cmake |