diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 08909063ce46..cb0d66c67719 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -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 ]; diff --git a/pkgs/development/interpreters/cling/force-install-cling-targets.patch b/pkgs/development/interpreters/cling/force-install-cling-targets.patch deleted file mode 100644 index 627e2593298e..000000000000 --- a/pkgs/development/interpreters/cling/force-install-cling-targets.patch +++ /dev/null @@ -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