BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #242724 from GenericNerdyUsername/jetbrains-replace-jbr

Browse source 
Jetbrains: replace jbr (instead of just removing)
This commit is contained in:
Pol Dellaiera 2023-07-14 10:03:07 +02:00 committed by GitHub
commit c11464c662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/jetbrains/default.nix
View file

@ -77,8 +77,6 @@ let
--replace-needed libcrypto.so.10 libcrypto.so --replace-needed libcrypto.so.10 libcrypto.so
autoPatchelf $PWD/bin autoPatchelf $PWD/bin
wrapProgram $out/bin/clion \
--set CL_JDK "${jdk}"
) )
''; '';
}); });

2
pkgs/applications/editors/jetbrains/linux.nix
View file

@ -71,6 +71,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
} }
rm -rf jbr rm -rf jbr
# When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
ln -s ${jdk.home} jbr
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then