diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-30 03:10:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 03:10:24 +0100 |
| commit | cb1286d31b9aed693e691843d604a03ba4411d07 (patch) | |
| tree | 2f11ce01e96514fb22dd25092bebeb7d1e99c5a2 /pkgs/applications/graphics | |
| parent | 9a339e0d6d070e888e1931a1bc53966bad808e8e (diff) | |
| parent | deb242d58cea194bc6fec78f8b1981a87309cfed (diff) | |
Merge pull request #270828 from evan-goode/evan-goode/processing
processing: 4.2 -> 4.3
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index b8d2adc909f29..54d6723f74270 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }: let - buildNumber = "1292"; + buildNumber = "1293"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "processing"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU="; + sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildPhase = '' 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/ mkdir -p core/library ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { installPhase = '' 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} rmdir $out/share/${pname}/java ln -s ${jdk} $out/share/${pname}/java |