Skip to content
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

xorg.xorgserver: fix darwin build #366504

Merged
merged 1 commit into from
Dec 29, 2024

Conversation

paparodeo
Copy link
Contributor

this change can be backported to release-24.11

disable libunwind detection as the configure step will detect the libunwind pkg-config stub but then the code will uses the unimplemented function unw_strerror.

the pkg-config stub was added in ec40b04

https://hydra.nixos.org/build/278453569/nixlog/2/tail
fixes: #359772

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

disable libunwind detection as the configure step will detect the
libunwind pkg-config stub but then the code will uses the unimplemented
function unw_strerror.

the pkg-config stub was added in ec40b04
@paparodeo paparodeo force-pushed the xorg-xorgserver-no-libunwind branch from ece5401 to 85ddc5d Compare December 19, 2024 11:22
@paparodeo paparodeo changed the title xorg.xrogserver: fix darwin build xorg.xorgserver: fix darwin build Dec 19, 2024
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 19, 2024
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 19, 2024
@RossComputerGuy
Copy link
Member

This is more of libunwind from nongnu being the only libunwind implementation to have unw_strerror. We might see if LLVM could implement the method, it doesn't have any issues or PR's related to it. Might be worth seeing if they could implement it or accept a PR adding it.

@paparodeo
Copy link
Contributor Author

This is more of libunwind from nongnu being the only libunwind implementation to have unw_strerror. We might see if LLVM could implement the method, it doesn't have any issues or PR's related to it. Might be worth seeing if they could implement it or accept a PR adding it.

it's easy enough to implement but it's out of scope for this PR

@RossComputerGuy
Copy link
Member

Yeah, I was just adding some context since someone I know also ran into this problem.

@paparodeo
Copy link
Contributor Author

and getting LLVM to add unw_strerror still will not fix darwin until darwin adds it to their libSystem since this isn't using the upstream llvm libunwind anyway. i did put together a change to that added unw_strerror to the darwin stub but decided against including it.

nonetheless -- none of this should be blocking on this PR.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 26, 2024
@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 366504


x86_64-darwin

⏩ 16 packages marked as broken and skipped:
  • perl538Packages.OpenGL
  • perl538Packages.OpenGL.devdoc
  • perl540Packages.OpenGL
  • perl540Packages.OpenGL.devdoc
  • xdummy
  • xorg.xf86inputjoystick
  • xorg.xf86inputmouse
  • xorg.xf86inputvoid
  • xorg.xf86videodummy
  • xorg.xf86videoglide
  • xorg.xf86videonewport
  • xorg.xf86videosuncg6
  • xorg.xf86videosunffb
  • xorg.xf86videosunleo
  • xorg.xf86videov4l
  • xorg.xf86videowsfb
✅ 3 packages built:
  • xorg.xinit
  • xorg.xorgserver
  • xquartz

aarch64-darwin

⏩ 16 packages marked as broken and skipped:
  • perl538Packages.OpenGL
  • perl538Packages.OpenGL.devdoc
  • perl540Packages.OpenGL
  • perl540Packages.OpenGL.devdoc
  • xdummy
  • xorg.xf86inputjoystick
  • xorg.xf86inputmouse
  • xorg.xf86inputvoid
  • xorg.xf86videodummy
  • xorg.xf86videoglide
  • xorg.xf86videonewport
  • xorg.xf86videosuncg6
  • xorg.xf86videosunffb
  • xorg.xf86videosunleo
  • xorg.xf86videov4l
  • xorg.xf86videowsfb
✅ 3 packages built:
  • xorg.xinit
  • xorg.xorgserver
  • xquartz

@khaneliman khaneliman merged commit 0698afd into NixOS:master Dec 29, 2024
50 of 52 checks passed
@paparodeo paparodeo deleted the xorg-xorgserver-no-libunwind branch December 29, 2024 06:04
@paparodeo
Copy link
Contributor Author

paparodeo commented Dec 29, 2024

thanks! this can get backported to release 24.11. I don't have permissions to add the tag myself.
https://hydra.nixos.org/build/279686005/nixlog/3/tail

@khaneliman khaneliman added the backport release-24.11 Backport PR automatically label Dec 29, 2024
@nixpkgs-ci
Copy link

nixpkgs-ci bot commented Dec 29, 2024

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

nixpkgs-unstable: xorg-server fails to build on macos
4 participants