From 1667a74168e1e9b8147e4774c9fd8a6577d4ad37 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:19:11 +0200 Subject: [PATCH] javaPackages.jogl_2_4_0: add darwin support --- pkgs/development/java-modules/jogl/default.nix | 15 +++++++++++---- pkgs/top-level/java-packages.nix | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index b090ec96586a..2506d8974fae 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -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 @@ -76,7 +83,7 @@ description = "Java libraries for 3D Graphics, Multimedia and Processing"; homepage = "https://jogamp.org/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; }; }; } diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index b004d4e7fc62..5d938a12e829 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -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; }