diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
commit | c456a2512f7a7558cbe25328a423762033822cc0 (patch) | |
tree | d64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/applications/misc/sweethome3d/editors.nix | |
parent | babf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff) | |
parent | 6d7128414cf2763ab14f31365c21c6cec3547dac (diff) | |
download | nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.gz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.bz2 nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.lz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.xz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.zst nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/sweethome3d/editors.nix')
-rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index c0cdc764dc3..f5dbd0510a3 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, sweethome3dApp }: +{ lib +, stdenv +, fetchcvs +, makeWrapper +, makeDesktopItem +# sweethome3d 6.4.2 does not yet build with jdk 9 and later. +# this is fixed on trunk (7699?) but let's build with jdk8 until then. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, sweethome3dApp }: let @@ -24,15 +36,19 @@ let }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jre jdk gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ]; - patchPhase = '' + postPatch = '' sed -i -e 's,../SweetHome3D,${application.src},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 ''; buildPhase = '' - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk}/lib + runHook preBuild + + ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + + runHook postBuild ''; installPhase = '' |