Merge pull request #147023 from wackbyte/fix-groove

groove: 5.7.4 -> 5.8.1 and jre -> jre8
This commit is contained in:
Artturi 2021-12-07 05:12:15 +02:00 committed by GitHub
commit 84bd0d6b7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre }:
{ lib, stdenv, fetchurl, unzip, makeWrapper, makeDesktopItem, icoutils, jre8 }:
let
desktopItem = makeDesktopItem {
@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "groove";
version = "5.7.4";
version = "5.8.1";
src = fetchurl {
url = "mirror://sourceforge/groove/groove/${version}/${pname}-${builtins.replaceStrings ["."] ["_"] version}-bin.zip";
sha256 = "1cl3xzl3n8b9a7h5pvnv31bab9j9zaw07ppk8whk8h865dcq1d10";
sha256 = "sha256-JwoUlO6F2+8NtCnLC+xm5q0Jm8RIyU1rnuKGmjgJhFU=";
};
nativeBuildInputs = [ unzip makeWrapper icoutils ];
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin
for bin in Generator Imager ModelChecker PrologChecker Simulator Viewer; do
makeWrapper ${jre}/bin/java $out/bin/groove-''${bin,,} \
makeWrapper ${jre8}/bin/java $out/bin/groove-''${bin,,} \
--add-flags "-jar $out/share/groove/bin/$bin.jar"
done