diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-03 13:33:59 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-03 15:33:11 +0200 |
| commit | f5672f753b300822390dec63b24684eac5a0a057 (patch) | |
| tree | e5b4e3046d3f166ea480a7409215e55909c1c753 /pkgs/applications/graphics/processing | |
| parent | 44a3ee95db7514c6abd9928100a4d3ec90853a3f (diff) | |
| download | nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar.gz nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar.bz2 nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar.lz nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar.xz nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.tar.zst nixpkgs-f5672f753b300822390dec63b24684eac5a0a057.zip | |
processing: unbreak on aarch64-linux
Diffstat (limited to 'pkgs/applications/graphics/processing')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 243fe056006..b8d2adc909f 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -37,6 +37,9 @@ let sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM="; }; + arch = { + x86_64 = "amd64"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; in stdenv.mkDerivation rec { pname = "processing"; @@ -50,16 +53,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; - buildInputs = [ jdk javaPackages.jogl_2_3_2 ant rsync ffmpeg batik ]; + buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ]; dontWrapGApps = true; buildPhase = '' echo "tarring jdk" - tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-amd64.tgz ${jdk} + tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library - ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/ + ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar |