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

cling: cleanup

This commit is contained in:
Weijia Wang 2024-04-09 06:41:04 +02:00
parent 886dd8d2fa
commit 1c905fa881
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/cling/default.nix
View File

@ -1,6 +1,5 @@
{ cmake
, fetchFromGitHub
, fetchgit
, git
, lib
, libffi
@ -53,7 +52,7 @@ let
clingSrc = fetchFromGitHub {
owner = "root-project";
repo = "cling";
rev = "v1.0";
rev = "v${version}";
sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4=";
};
@ -66,8 +65,6 @@ let
patches = [
./no-clang-cpp.patch
# ./force-install-cling-targets.patch
];
nativeBuildInputs = [ python3 git cmake ];

16
pkgs/development/interpreters/cling/force-install-cling-targets.patch
View File

@ -1,16 +0,0 @@
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