From bbbe3d4ddc67fab9d39d9dade898478de462ffea Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 17 Dec 2024 16:41:57 -0800 Subject: [PATCH] llvmPackages: remove _IMPORT_PREFIX replacements These strings do not show up in the files where they are attempting to be replaced. --- .../compilers/llvm/common/clang/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index fafdf69f5559..7ce5b0147a20 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -102,16 +102,6 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" moveToOutput "lib/libclang-cpp.*" "$lib" - '' + (if lib.versionOlder release_version "15" then '' - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace-fail "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ - --replace-fail "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - '' else '' - substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ - --replace-fail "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ - --replace-fail "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - '') + '' - '' + (if lib.versionOlder release_version "15" then '' mkdir -p $python/bin $python/share/{clang,scan-view} '' else ''