about summary refs log tree commit diff
path: root/pkgs/applications/editors/jetbrains
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-03-22 11:27:02 +0000
committerJörg Thalheim <joerg@thalheim.io>2018-03-22 11:28:40 +0000
commitb9b08f8a093e8981121697fbdf61bfd714acd6cb (patch)
treef69d28947ef12a58a5c627db27a94d55db94ebd6 /pkgs/applications/editors/jetbrains
parentdfba22e28a4a5f886a9eb6e5d7e9716170efbe0e (diff)
downloadnixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar.gz
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar.bz2
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar.lz
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar.xz
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.tar.zst
nixlib-b9b08f8a093e8981121697fbdf61bfd714acd6cb.zip
webstorm: fix incorrect jre usuage
it tried to use its own jre, which is not patched

fixes #36943 #37328
Diffstat (limited to 'pkgs/applications/editors/jetbrains')
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a4a71c12820e..3c5574388236 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -211,7 +211,7 @@ let
     });
 
   buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
-    (mkJetBrainsProduct {
+    lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
       meta = with stdenv.lib; {
@@ -225,8 +225,13 @@ let
         maintainers = with maintainers; [ abaldeau ];
         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
 
 {