From e13e02f300baa9315def56a5ae1d9547b1086ebc Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 20 Sep 2020 11:41:06 +0200
Subject: [PATCH] jedit: use latest jdk

---
 pkgs/applications/editors/jedit/default.nix | 8 ++------
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 178494b0498..18fe236983a 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -44,12 +44,8 @@ stdenv.mkDerivation {
     mkdir -p $out/share/applications
     mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
 
-    patch package-files/linux/jedit << EOF
-    5a6,8
-    > # specify the correct JAVA_HOME
-    > JAVA_HOME=${jdk.jre.home}/jre
-    > 
-    EOF
+    # specify the correct JAVA_HOME
+    sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit
     sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
     mkdir -p $out/bin
     cp package-files/linux/jedit $out/bin/jedit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7858cee135a..60308319291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21432,9 +21432,7 @@ in
 
   jdupes = callPackage ../tools/misc/jdupes { };
 
-  jedit = callPackage ../applications/editors/jedit {
-    jdk = jdk8; # TODO: upgrade
-  };
+  jedit = callPackage ../applications/editors/jedit { };
 
   jgmenu = callPackage ../applications/misc/jgmenu { };