Unverified Commit bd842687 authored by nicoo's avatar nicoo Committed by GitHub
Browse files

Merge #310403: hmcl 3.5.5 -> 3.5.7 

Also let the drv have a designated maintainer again.
parents 4bb2fe0d 1cb1f3bc

pkgs/games/hmcl/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
}:



let

  version = "3.5.5";

  version = "3.5.7";

  icon = fetchurl {

    url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico";

    hash = "sha256-MWp78rP4b39Scz5/gpsjwaJhSu+K9q3S2B2cD/V31MA=";

    hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc=";

  };

in

stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar";

    hash = "sha256-bXZF38pd8I8cReuDNrZzDj1hp1Crk+P26JNiikUCg4g=";

    hash = "sha256-ziqcauetWoFn58kBJ0KnqX5CPNC/Sn7DD/Buxdi977I=";

  };



  dontUnpack = true;
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { 
      mkdir -p $out/{bin,lib/hmcl}

      cp $src $out/lib/hmcl/hmcl.jar

      magick ${icon} hmcl.png

      install -Dm644 hmcl.png $out/share/icons/hicolor/32x32/apps/hmcl.png

      install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png

      makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \

        --add-flags "-jar $out/lib/hmcl/hmcl.jar" \

        --set LD_LIBRARY_PATH ${libpath}
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { 
    mainProgram = "hmcl";

    sourceProvenance = with sourceTypes; [ binaryBytecode ];

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ ];

    maintainers = with maintainers; [ daru-san ];

    inherit (jre.meta) platforms;

  };

})