diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-01 12:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 12:00:58 +0000 |
| commit | 18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734 (patch) | |
| tree | 7f09de5aac11016e7dd8a89567547a43148ec71f /pkgs/applications/graphics | |
| parent | ee08be2ebdb497d3149ccdc3927f714a3640f6fd (diff) | |
| parent | dbc93a12161bff01eba5902fbba6d539dd6c7b0c (diff) | |
| download | nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.gz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.bz2 nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.lz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.xz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.zst nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 65cd2bea4770..3df5013cc078 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook, libGL }: let buildNumber = "1293"; vaqua = fetchurl { @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildPhase = '' + runHook preBuild + echo "tarring 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/ @@ -78,9 +80,13 @@ stdenv.mkDerivation rec { cd build ant build cd .. + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/ mkdir -p $out/share/applications/ cp -dp build/linux/${pname}.desktop $out/share/applications/ @@ -89,10 +95,14 @@ stdenv.mkDerivation rec { ln -s ${jdk} $out/share/${pname}/java makeWrapper $out/share/${pname}/processing $out/bin/processing \ ''${gappsWrapperArgs[@]} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ ''${gappsWrapperArgs[@]} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + + runHook postInstall ''; meta = with lib; { |