ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
amidst: use jre instead of jre8
This commit is contained in:
Sandro 2021-06-23 13:30:53 +02:00 committed by GitHub
commit 1905f5f2e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/games/amidst/default.nix
View File

@ -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"
''; '';