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

libsmbios: Fix build #246264

Merged
merged 2 commits into from
Jul 31, 2023
Merged

libsmbios: Fix build #246264

merged 2 commits into from
Jul 31, 2023

Conversation

Artturin
Copy link
Member

Since 5093766 TMPDIR is needed in fixupPhase

RUNPATH before

$ , objdump -x ./result/bin/smbios-sys-info-lite | grep RUNPATH
  RUNPATH              /nix/store/hn044f8g9b2dfynljlm3nsr32g3pwqr1-libsmbios-2.4.3/lib:/nix/store/1x4ijm9r1a88qk7zcmbbfza324gx1aac-glibc-2.37-8/lib

RUNPATH after

$ , objdump -x ./result/bin/smbios-sys-info-lite | grep RUNPATH
  RUNPATH              /nix/store/l3ayxdl45xs6fam6b8n0j0fs34hj7gdq-libsmbios-2.4.3/lib:/nix/store/1x4ijm9r1a88qk7zcmbbfza324gx1aac-glibc-2.37-8/lib

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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.

Since 5093766 TMPDIR is needed in
fixupPhase

RUNPATH before
```
$ , objdump -x ./result/bin/smbios-sys-info-lite | grep RUNPATH
  RUNPATH              /nix/store/hn044f8g9b2dfynljlm3nsr32g3pwqr1-libsmbios-2.4.3/lib:/nix/store/1x4ijm9r1a88qk7zcmbbfza324gx1aac-glibc-2.37-8/lib
```

RUNPATH after
```
$ , objdump -x ./result/bin/smbios-sys-info-lite | grep RUNPATH
  RUNPATH              /nix/store/l3ayxdl45xs6fam6b8n0j0fs34hj7gdq-libsmbios-2.4.3/lib:/nix/store/1x4ijm9r1a88qk7zcmbbfza324gx1aac-glibc-2.37-8/lib
```
@Artturin Artturin requested a review from vcunat July 30, 2023 23:22
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Jul 30, 2023
@Artturin Artturin merged commit f1d5f97 into NixOS:staging-next Jul 31, 2023
@Artturin Artturin deleted the fixlibsmbios branch July 31, 2023 04:14
@Artturin
Copy link
Member Author

Making it more future proof #246293

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: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant