Merge pull request #246876 from wegank/jogl-platforms
gephi, processing: support more platforms
This commit is contained in:
Weijia Wang
GitHub
commit
029622d055
@ -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
|
||||
|
||||
@ -44,6 +44,5 @@ mavenJdk11.buildMavenPackage rec {
|
||||
];
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.taeer ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet }:
|
||||
{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet, xcbuild, darwin }:
|
||||
|
||||
{
|
||||
jogl_2_4_0 =
|
||||
@ -27,8 +27,15 @@
|
||||
|
||||
unpackCmd = "cp -r $curSrc \${curSrc##*-}";
|
||||
|
||||
nativeBuildInputs = [ ant jdk11 git xmlstarlet ];
|
||||
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ];
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml
|
||||
rm -r jogl/oculusvr-sdk
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ant jdk11 git xmlstarlet ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
|
||||
@ -48,6 +55,10 @@
|
||||
|
||||
( cd jogl/make
|
||||
|
||||
# prevent looking for native libraries in /usr/lib
|
||||
substituteInPlace build-*.xml \
|
||||
--replace 'dir="''${TARGET_PLATFORM_USRLIBS}"' ""
|
||||
|
||||
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
|
||||
# if arm/aarch64 support will be added, this block might be commented out on those platforms
|
||||
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
|
||||
@ -63,83 +74,16 @@
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
|
||||
cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/
|
||||
cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-amd64,-os-drm,-os-x11}.jar $out/share/java/
|
||||
cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/
|
||||
cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/
|
||||
cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Java libraries for 3D Graphics, Multimedia and Processing";
|
||||
homepage = "https://jogamp.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
};
|
||||
|
||||
jogl_2_3_2 =
|
||||
let
|
||||
version = "2.3.2";
|
||||
|
||||
gluegen-src = fetchgit {
|
||||
url = "git://jogamp.org/srv/scm/gluegen.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "jogl";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://jogamp.org/srv/scm/jogl.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
find . -type f -name '*.java' \
|
||||
-exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@' {} \; \
|
||||
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
|
||||
'';
|
||||
|
||||
# TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
|
||||
nativeBuildInputs = [ jdk8 ant git ];
|
||||
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
|
||||
# `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildPhase = ''
|
||||
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
|
||||
chmod -R +w $NIX_BUILD_TOP/gluegen
|
||||
( cd ../gluegen/make
|
||||
ant )
|
||||
|
||||
( cd make
|
||||
|
||||
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
|
||||
# if arm/aarch64 support will be added, this block might be commented out on those platforms
|
||||
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
|
||||
cp build-newt.xml build-newt.xml.old
|
||||
fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml
|
||||
|
||||
ant )
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
|
||||
cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Java libraries for 3D Graphics, Multimedia and Processing";
|
||||
homepage = "https://jogamp.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -223,7 +223,6 @@ in {
|
||||
) {});
|
||||
};
|
||||
|
||||
inherit (callPackage ../development/java-modules/jogl { })
|
||||
jogl_2_3_2
|
||||
inherit (pkgs.darwin.apple_sdk_11_0.callPackage ../development/java-modules/jogl { })
|
||||
jogl_2_4_0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user