b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

javaPackages.jogl_2_4_0: add darwin support

Browse source
This commit is contained in:
Weijia Wang 2023-08-03 15:19:11 +02:00
parent 3b438ab99e
commit 1667a74168
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/java-modules/jogl/default.nix
View file

@ -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 = jogl_2_4_0 =
@ -27,8 +27,15 @@
unpackCmd = "cp -r $curSrc \${curSrc##*-}"; unpackCmd = "cp -r $curSrc \${curSrc##*-}";
nativeBuildInputs = [ ant jdk11 git xmlstarlet ]; postPatch = lib.optionalString stdenv.isDarwin ''
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ]; 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: # Workaround build failure on -fno-common toolchains:
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of # ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
@ -76,7 +83,7 @@
description = "Java libraries for 3D Graphics, Multimedia and Processing"; description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = "https://jogamp.org/"; homepage = "https://jogamp.org/";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.all;
}; };
}; };
} }

2
pkgs/top-level/java-packages.nix
View file

@ -223,6 +223,6 @@ in {
) {}); ) {});
}; };
inherit (callPackage ../development/java-modules/jogl { }) inherit (pkgs.darwin.apple_sdk_11_0.callPackage ../development/java-modules/jogl { })
jogl_2_4_0; jogl_2_4_0;
} }