diff options
| author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-03-01 11:40:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 11:40:31 +0000 |
| commit | f57ceeafd08d285be127b30cda73604b4c0e2473 (patch) | |
| tree | 209dc15ae7c390b75ee9c4707b968be98ecded5e /pkgs/applications/graphics | |
| parent | 201eeb4018267d624522019ff47c5afc38ddd4a3 (diff) | |
| parent | ba7c7a0969db20db48920be0e5393d7f5b812b5b (diff) | |
Merge pull request #291298 from eclairevoyant/processing
processing: fix wrapper and phases
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 65cd2bea47709..3df5013cc078f 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; { |