jogl: use new apple sdk pattern

This commit is contained in:
Weijia Wang
2025-01-03 17:25:03 +01:00
parent 0d2230e8ea
commit f937f7a3e4
2 changed files with 11 additions and 21 deletions
+11 -17
View File
@@ -11,7 +11,6 @@
udev,
xorg,
libgbm,
darwin,
coreutils,
}:
@@ -78,22 +77,17 @@ stdenv.mkDerivation {
xcbuild
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
udev
xorg.libX11
xorg.libXrandr
xorg.libXcursor
xorg.libXi
xorg.libXt
xorg.libXxf86vm
xorg.libXrender
libgbm
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.Cocoa
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
udev
xorg.libX11
xorg.libXrandr
xorg.libXcursor
xorg.libXi
xorg.libXt
xorg.libXxf86vm
xorg.libXrender
libgbm
];
env = {
SOURCE_LEVEL = "1.8";
-4
View File
@@ -3854,10 +3854,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
jogl = callPackage ../by-name/jo/jogl/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
};
joplin = nodePackages.joplin;
jpylyzer = with python3Packages; toPythonApplication jpylyzer;