git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127853 from IvarWithoutBones/fix/amidst-jre

amidst: use jre instead of jre8

commit1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d authorSandro <sandro.jaeckel@gmail.com> dateWed 23 Jun 2021, 13:30 (5 years ago) parenta0e8af4afb2e12
1 file changed+3−3
pkgs/tools/games/amidst/default.nix+3−3
pkgs/tools/games/amidst/default.nix+3−3
@@ -2,7 +2,7 @@
22, stdenv
33, fetchurl
44, makeWrapper
5−, jre8 }: # TODO: Update this to the latest version of java upon the next release. This is currently not done because of https://github.com/toolbox4minecraft/amidst/issues/960
5+, jre }:
66
77stdenv.mkDerivation rec {
88 pname = "amidst";
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
1515
1616 dontUnpack = true;
1717
18− nativeBuildInputs = [ jre8 makeWrapper ];
18+ nativeBuildInputs = [ jre makeWrapper ];
1919
2020 installPhase = ''
2121 mkdir -p $out/{bin,lib/amidst}
2222 cp $src $out/lib/amidst/amidst.jar
23− makeWrapper ${jre8}/bin/java $out/bin/amidst \
23+ makeWrapper ${jre}/bin/java $out/bin/amidst \
2424 --add-flags "-jar $out/lib/amidst/amidst.jar"
2525 '';
2626