Skip to content

Commit 786710e

Browse files
authored
jogl: use new apple sdk pattern (NixOS#370655)
2 parents b570d4b + f937f7a commit 786710e

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

pkgs/by-name/jo/jogl/package.nix

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
udev,
1212
xorg,
1313
libgbm,
14-
darwin,
1514
coreutils,
1615
}:
1716

@@ -78,22 +77,17 @@ stdenv.mkDerivation {
7877
xcbuild
7978
];
8079

81-
buildInputs =
82-
lib.optionals stdenv.hostPlatform.isLinux [
83-
udev
84-
xorg.libX11
85-
xorg.libXrandr
86-
xorg.libXcursor
87-
xorg.libXi
88-
xorg.libXt
89-
xorg.libXxf86vm
90-
xorg.libXrender
91-
libgbm
92-
]
93-
++ lib.optionals stdenv.hostPlatform.isDarwin [
94-
darwin.apple_sdk_11_0.frameworks.AppKit
95-
darwin.apple_sdk_11_0.frameworks.Cocoa
96-
];
80+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
81+
udev
82+
xorg.libX11
83+
xorg.libXrandr
84+
xorg.libXcursor
85+
xorg.libXi
86+
xorg.libXt
87+
xorg.libXxf86vm
88+
xorg.libXrender
89+
libgbm
90+
];
9791

9892
env = {
9993
SOURCE_LEVEL = "1.8";

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3847,10 +3847,6 @@ with pkgs;
38473847
inherit (darwin.apple_sdk.frameworks) AppKit;
38483848
};
38493849

3850-
jogl = callPackage ../by-name/jo/jogl/package.nix {
3851-
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
3852-
};
3853-
38543850
joplin = nodePackages.joplin;
38553851

38563852
jpylyzer = with python3Packages; toPythonApplication jpylyzer;

0 commit comments

Comments
 (0)