processing: 4.2 -> 4.3
This commit is contained in:
parent
ff6d8638eb
commit
deb242d58c
@ -1,6 +1,6 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }:
|
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }:
|
||||||
let
|
let
|
||||||
buildNumber = "1292";
|
buildNumber = "1293";
|
||||||
vaqua = fetchurl {
|
vaqua = fetchurl {
|
||||||
name = "VAqua9.jar";
|
name = "VAqua9.jar";
|
||||||
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
|
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
|
||||||
@ -43,13 +43,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "processing";
|
pname = "processing";
|
||||||
version = "4.2";
|
version = "4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "processing";
|
owner = "processing";
|
||||||
repo = "processing4";
|
repo = "processing4";
|
||||||
rev = "processing-${buildNumber}-${version}";
|
rev = "processing-${buildNumber}-${version}";
|
||||||
sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU=";
|
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
|
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
|
||||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
echo "tarring jdk"
|
echo "tarring jdk"
|
||||||
tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk}
|
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
|
||||||
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
|
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
|
||||||
mkdir -p core/library
|
mkdir -p core/library
|
||||||
ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/
|
ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/
|
||||||
@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/
|
mkdir -p $out/share/
|
||||||
|
mkdir -p $out/share/applications/
|
||||||
|
cp -dp build/linux/${pname}.desktop $out/share/applications/
|
||||||
cp -dpr build/linux/work $out/share/${pname}
|
cp -dpr build/linux/work $out/share/${pname}
|
||||||
rmdir $out/share/${pname}/java
|
rmdir $out/share/${pname}/java
|
||||||
ln -s ${jdk} $out/share/${pname}/java
|
ln -s ${jdk} $out/share/${pname}/java
|
||||||
|
Loading…
Reference in New Issue
Block a user