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

webstorm: fix incorrect jre usuage

Browse Source 
it tried to use its own jre, which is not patched

fixes #36943 #37328
This commit is contained in:
Jörg Thalheim 2018-03-22 11:27:02 +00:00
parent dfba22e28a
commit b9b08f8a09
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ let
}); });
buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
(mkJetBrainsProduct { lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "WebStorm"; product = "WebStorm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -225,8 +225,13 @@ let
maintainers = with maintainers; [ abaldeau ]; maintainers = with maintainers; [ abaldeau ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) (attrs: {
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
# Webstorm tries to use bundled jre if available.
# Lets prevent this for the moment
rm -r jre64
'';
}); });
in in
{ {