Skip to content

Commit

Permalink
sweethome3d.{application,textures-editor,furniture-editor}: fix build…
Browse files Browse the repository at this point in the history
… for latest jdk

(cherry picked from commit 040c54e)
  • Loading branch information
TomaSajt authored and bjornfor committed May 5, 2024
1 parent f915744 commit bdbbccd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkgs/applications/misc/sweethome3d/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ let
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ];

# upstream targets Java 7 by default
env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8";

buildPhase = ''
runHook preBuild
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/sweethome3d/editors.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ let
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ];

# upstream targets Java 7 by default
env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8";

postPatch = ''
sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml
sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml
Expand Down

0 comments on commit bdbbccd

Please sign in to comment.