Merge pull request #127853 from IvarWithoutBones/fix/amidst-jre

amidst: use jre instead of jre8
launchpad/nixpkgs/master
Sandro 3 years ago committed by GitHub
commit 1905f5f2e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkgs/tools/games/amidst/default.nix

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, 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 , jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "amidst"; pname = "amidst";
@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
dontUnpack = true; dontUnpack = true;
nativeBuildInputs = [ jre8 makeWrapper ]; nativeBuildInputs = [ jre makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/{bin,lib/amidst} mkdir -p $out/{bin,lib/amidst}
cp $src $out/lib/amidst/amidst.jar cp $src $out/lib/amidst/amidst.jar
makeWrapper ${jre8}/bin/java $out/bin/amidst \ makeWrapper ${jre}/bin/java $out/bin/amidst \
--add-flags "-jar $out/lib/amidst/amidst.jar" --add-flags "-jar $out/lib/amidst/amidst.jar"
''; '';

Loading…
Cancel
Save