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

wcslib: refactor and fix noBrokenSymlinks #380492

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conversation

emaryn
Copy link
Contributor

@emaryn emaryn commented Feb 8, 2025

Resolves #380487

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.

Comment on lines +26 to +31
# DOCDIR is set to the path $out/share/doc/wcslib, and DOCLINK points
# to the same location.
# `$(LN_S) $(notdir $(DOCDIR)) $(DOCLINK)` effectively running:
# `ln -s wcslib $out/share/doc/wcslib`
# This produces a broken link because the target location already exists
dontCheckForBrokenSymlinks = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this explanation, it seems like what you had previously is better: I understand why removing the broken symlink is the right thing to do, as that symlink was never intended to be created by the (broken) Makefile that way.

We should also create an issue upstream about it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if DOCLINK is given a reasonable path it should work. Maybe dontCheckForBrokenSymlinks would be good too. I'm not interested in upstream feedback.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: wcslib 8.4 - reflexive symlink issues
4 participants