diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-12-01 20:54:22 +0000 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-12-01 20:54:22 +0000 |
| commit | 617d053f300f28e8ecfdb130b88ec1131abfd511 (patch) | |
| tree | 277a6c2e1746779a898a08bf23bc7393213a09d3 /pkgs/applications/editors | |
| parent | 50b498d23e7575fe2ace2d63af6310c9c515021a (diff) | |
| download | nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar.gz nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar.bz2 nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar.lz nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar.xz nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.tar.zst nixlib-617d053f300f28e8ecfdb130b88ec1131abfd511.zip | |
jetbrains.clion: patchelf lldb files correctly
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8247c66de95f..ec0d90115e64 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses +, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses }: assert stdenv.isLinux; @@ -41,11 +41,19 @@ let patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ bin/lldb/bin/lldb-server - patchelf --set-interpreter $interp \ + + for i in LLDBFrontend lldb lldb-argdumper; do + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ + "bin/lldb/bin/$i" + done + + patchelf \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/LLDBFrontend + bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + patchelf \ - --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \ + --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ bin/lldb/lib/liblldb.so patchelf --set-interpreter $interp bin/gdb/bin/gdb |