From dd2c1dd5c864331394946d288b505ebf199ce149 Mon Sep 17 00:00:00 2001 From: pmenke Date: Mon, 19 Apr 2021 23:36:55 +0200 Subject: [PATCH] jetbrains.clion: add patchelf invocations for new binaries version 2021.1 of clion (introduced with 3839373) has introduced additional clang related binaries which need patching. clangd and clazy-standalone also need the provided libclazyPlugin.so on the rpath. --- pkgs/applications/editors/jetbrains/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fff9c8a2de6..771c1f73175 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -65,12 +65,19 @@ let --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \ bin/gdb/linux/bin/gdbserver + clangPath=$out/clion-${version}/bin/clang/linux/ patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$clangPath" \ bin/clang/linux/clangd patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ bin/clang/linux/clang-tidy + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ + bin/clang/linux/llvm-symbolizer + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$clangPath" \ + bin/clang/linux/clazy-standalone wrapProgram $out/bin/clion \ --set CL_JDK "${jdk}"