Merge pull request #196457 from lucc/jugglinglab
jugglinglab: 1.2.1 -> 1.6.3
This commit is contained in:
commit
ed44dddfc6
1 changed files with 11 additions and 5 deletions
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
|
{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.2.1";
|
version = "1.6.3";
|
||||||
pname = "jugglinglab";
|
pname = "jugglinglab";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jkboyce";
|
owner = "jkboyce";
|
||||||
repo = "jugglinglab";
|
repo = "jugglinglab";
|
||||||
rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github
|
rev = "v${version}";
|
||||||
sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z";
|
sha256 = "sha256-Gq8V7gLl9IakQi7xaK8TCI/B2+6LlLjoLdcv9zlalIE=";
|
||||||
};
|
};
|
||||||
buildInputs = [ jre ];
|
buildInputs = [ jre ];
|
||||||
nativeBuildInputs = [ ant jdk makeWrapper ];
|
nativeBuildInputs = [ ant jdk makeWrapper ];
|
||||||
|
@ -15,14 +15,20 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
mkdir -p "$out/lib"
|
mkdir -p "$out/lib"
|
||||||
cp bin/JugglingLab.jar $out/lib/
|
cp bin/*.jar $out/lib/
|
||||||
|
|
||||||
|
# copied from the upstream shell wrapper
|
||||||
|
classpath=$out/lib/JugglingLab.jar:$out/lib/commons-math3-3.6.1.jar:$out/lib/protobuf.jar:$out/lib/com.google.ortools.jar
|
||||||
|
|
||||||
makeWrapper ${jre}/bin/java $out/bin/jugglinglab \
|
makeWrapper ${jre}/bin/java $out/bin/jugglinglab \
|
||||||
--add-flags "-jar $out/lib/JugglingLab.jar"
|
--add-flags "-cp $classpath" \
|
||||||
|
--add-flags "-Xss2048k -Djava.library.path=ortools-lib" \
|
||||||
|
--add-flags jugglinglab.JugglingLab
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A program to visualize different juggling pattens";
|
description = "A program to visualize different juggling pattens";
|
||||||
|
homepage = "https://jugglinglab.org/";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ wnklmnn ];
|
maintainers = with maintainers; [ wnklmnn ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
|
|
Loading…
Reference in a new issue