git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119905 from pmenke-de/clion-2021.1-patchelf

jetbrains.clion: add patchelf invocations for new binaries

commit991390994a2ce33be13a01153bfcf4810fd5c30e authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 20 Apr 2021, 19:58 (6 years ago) parent6a707e8d94d7c7
1 file changed+13−39
pkgs/applications/editors/jetbrains/default.nix+13−39
pkgs/applications/editors/jetbrains/default.nix+13−39
@@ -1,6 +1,9 @@
11{ lib, stdenv, callPackage, fetchurl
22, jdk, cmake, libxml2, zlib, python3, ncurses5
33, dotnet-sdk_3
4+, autoPatchelfHook
5+, glib
6+, libdbusmenu
47, vmopts ? null
58}:
69
@@ -25,6 +28,15 @@ let
2528 platforms = platforms.linux;
2629 };
2730 }).overrideAttrs (attrs: {
31+ nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [
32+ autoPatchelfHook
33+ ];
34+ buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [
35+ python3
36+ stdenv.cc.cc
37+ libdbusmenu
38+ ];
39+ dontAutoPatchelf = true;
2840 postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
2941 (
3042 cd $out/clion-${version}
@@ -32,45 +44,7 @@ let
3244 rm -rf bin/cmake/linux
3345 ln -s ${cmake} bin/cmake/linux
3446
35− lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
36− interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
37− ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5
38−
39− patchelf --set-interpreter $interp \
40− --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
41− bin/lldb/linux/bin/lldb-server
42−
43− for i in LLDBFrontend lldb lldb-argdumper; do
44− patchelf --set-interpreter $interp \
45− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
46− "bin/lldb/linux/bin/$i"
47− done
48−
49− patchelf \
50− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
51− bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
52−
53− patchelf \
54− --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
55− bin/lldb/linux/lib/liblldb.so
56−
57− gdbLibPath=$out/clion-${version}/bin/gdb/linux/lib
58− patchelf \
59− --set-rpath "$gdbLibPath" \
60− bin/gdb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
61− patchelf --set-interpreter $interp \
62− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$gdbLibPath" \
63− bin/gdb/linux/bin/gdb
64− patchelf --set-interpreter $interp \
65− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \
66− bin/gdb/linux/bin/gdbserver
67−
68− patchelf --set-interpreter $interp \
69− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
70− bin/clang/linux/clangd
71− patchelf --set-interpreter $interp \
72− --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
73− bin/clang/linux/clang-tidy
47+ autoPatchelf $PWD/bin
7448
7549 wrapProgram $out/bin/clion \
7650 --set CL_JDK "${jdk}"