-
-
Notifications
You must be signed in to change notification settings - Fork 17.5k
{libGL,libGLU,libglut}: don’t use deprecated stubs on Darwin #400427
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
e41cfd0 to
3dbddb5
Compare
3dbddb5 to
21356eb
Compare
07ca4e8 to
310086a
Compare
|
Switched this to |
This was removed by upstream in <renpy/renpy@f2d3e0d>.
This isn’t used by the X11 backend anyway, which is the only one we build for macOS. Even though it has a native macOS frontend. But I don’t want to spend more time on this.
Patch needs adjusting, build process is super messed up, package is out of date and not used in Nixpkgs other than by another unused library… not worth it.
310086a to
f0c9536
Compare
pkgs/top-level/all-packages.nix
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work? When the cc-wrapper hook processes the flags, it resolves environment variables?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that they get expanded inside env.*? Maybe with structured attributes you have to do it in a Bash phase instead? I could just recommend that instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it has to be done in Bash in one of the phases. Otherwise, I think you’ll get something like:
clang: warning: argument unused during compilation: '-L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries' [-Wunused-command-line-argument]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amended appropriately. Though since only one package in the tree even does this, probably it wasn’t even worth documenting.
reckenrode
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise LGTM.
f0c9536 to
4727c86
Compare
K900
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
Merging to unblock Darwin deprecations for the 25.11 deadline, but keeping the door open to changing |
cc @reckenrode who had some reservations about the choice ofapple-sdkovernullhere.I have commits to make channel eval pass withnull, but they’re a little ugly (e.g. changing packages that already don’t eval on Darwin, fixing stuff in KDE and Perl that doesn’t expectnullbuild inputs) and since it broke a good handful of things in Nixpkgs, even ones that aren’t doing incorrect string interpolations, I figure it’d probably break external users too, andapple-sdkis strictly more correct in a sense (although sadly it becomes less strictly more correct in the presence of multiple SDK versions).I’ve left in the truly benign/net‐positive clean‐ups I did on the road to makingnullwork, though. I’m happy to change this to usenulland restore the additional fix‐up commits if that’s preferred.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.