philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

jedit: use latest jdk

gstqt5
Gabriel Ebner 2020-09-20 11:41:06 +02:00
parent ef4cbbabd1
commit e13e02f300
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/jedit/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };