diff options
| author | pmenke <nixos@pmenke.de> | 2021-04-19 23:36:55 +0200 |
|---|---|---|
| committer | pmenke <nixos@pmenke.de> | 2021-04-19 23:36:55 +0200 |
| commit | dd2c1dd5c864331394946d288b505ebf199ce149 (patch) | |
| tree | 66d927605d95e03c7682b6865026230086a10f71 /pkgs/applications/editors/jetbrains | |
| parent | 213fcedc176d05baced96f53d5c36c28311c0151 (diff) | |
| download | nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar.gz nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar.bz2 nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar.lz nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar.xz nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.tar.zst nixpkgs-dd2c1dd5c864331394946d288b505ebf199ce149.zip | |
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.
Diffstat (limited to 'pkgs/applications/editors/jetbrains')
| -rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
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}" |