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

libnvidia-container: fix dangling symlinks #375291

Merged

Conversation

msanft
Copy link
Contributor

@msanft msanft commented Jan 20, 2025

a5fef0d caused some dangling symlinks in the package output by stubbing ldconfig. This fixes it by recreating the symlinks after the package is built, keeping the compilation working on aarch64-linux.

Can be tested via checking the result/lib directory before the mentioned commit, after it, and with this fix.

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.

@msanft msanft requested a review from philiptaron January 20, 2025 09:32
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 20, 2025
@nix-owners nix-owners bot requested a review from cpcloud January 20, 2025 09:42
@msanft msanft requested review from katexochen and removed request for cpcloud January 20, 2025 09:56
@farcaller
Copy link
Contributor

Driveby commenting that this fixes the nvidia breakage in k3s's containerd.

@philiptaron philiptaron requested a review from a team January 22, 2025 17:11
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 23, 2025
NixOS@a5fef0d
caused some dangling symlinks in the package output by stubbing
`ldconfig`. This fixes it by recreating the symlinks after the package
is built, keeping the compilation working on `aarch64-linux`.

Can be tested via checking the `result/lib` directory before the
mentioned commit, after it, and with this fix.

Signed-off-by: Moritz Sanft <[email protected]>
@msanft msanft force-pushed the msanft/libnvidia-container/symlink-fixes branch from 28c845c to 835109e Compare January 28, 2025 11:59
@msanft msanft requested a review from samuela January 28, 2025 11:59
@nix-owners nix-owners bot requested a review from cpcloud January 28, 2025 12:07
Copy link
Member

@samuela samuela left a comment

Choose a reason for hiding this comment

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

diff lgtm but i don't use this package so i can't comment on whether it works or not

@msanft
Copy link
Contributor Author

msanft commented Jan 30, 2025

Is extensively tested by us by now, so merging this here

@msanft msanft merged commit 3f5b822 into NixOS:master Jan 30, 2025
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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.

4 participants