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.

Sign up for GitHub

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

Jump to bottom

autoPatchelfHook: fix shell expansion issue & add glob support #195306

Merged
merged 2 commits into from
Oct 10, 2022
Merged

autoPatchelfHook: fix shell expansion issue & add glob support #195306

merged 2 commits into from
Oct 10, 2022

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Oct 10, 2022 •
edited
Loading

Description of changes

Setting autoPatchelfIgnoreMissingDeps = true; is deprecated but the recommended replacement autoPatchelfIgnoreMissingDeps = [ "*" ]; doesn't actually work as the asterisk gets expanded in the builder shell and auto-patchelf.py gets passed a list of files in the build directory.

Additionally an asterisk as the API to skip a file implies (at least to me) globbing support so you can express something like:

autoPatchelfIgnoreMissingDeps = [ "*cuda*.so*" ];

which I've also added in this PR.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

cc @samuela

@adisbladis adisbladis mentioned this pull request Oct 10, 2022
Merged
@adisbladis adisbladis changed the base branch from master to staging October 10, 2022 02:35
@adisbladis
autoPatchelfHook: fix turning [ "*" ] into bash array
41c0964 
Previously globs were incorrectly handled and expanded by bash into the files in the temporary build directory.
@adisbladis
autoPatchelfHook: support glob patterns
01535ff 
so for example cuda could be ignored by setting:
``` nix
autoPatchelfIgnoreMissingDeps = [ "*cuda*.so*" ];
```
@lovesegfault lovesegfault merged commit 0b21851 into NixOS:staging Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@layus layus Awaiting requested review from layus

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@adisbladis @lovesegfault