public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `extraLdPath` to main jetbrains builder

This commit is contained in:
Gytis Ivaskevicius 2021-02-16 01:03:41 +02:00 committed by Edward Tjörnhammar
parent dc0e2bfd78
commit 6508977c17
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/jetbrains/common.nix
View File

@ -3,7 +3,7 @@
, vmopts ? null , vmopts ? null
}: }:
{ name, product, version, src, wmClass, jdk, meta }: { name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
with lib; with lib;
@ -72,11 +72,11 @@ with stdenv; lib.makeOverridable mkDerivation rec {
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6 # Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret stdenv.cc.cc.lib libsecret
libnotify libnotify
]}" \ ] ++ extraLdPath)}" \
--set JDK_HOME "$jdk" \ --set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \

3
pkgs/applications/editors/jetbrains/default.nix
View File

@ -125,6 +125,7 @@ let
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "IDEA"; product = "IDEA";
extraLdPath = [ zlib ];
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/idea/"; homepage = "https://www.jetbrains.com/idea/";
inherit description license; inherit description license;
@ -135,7 +136,7 @@ let
as IntelliJ. as IntelliJ.
''; '';
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux ++ platforms.darwin; platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ];
}; };
}); });