Skip to content

mtrace: use makeFlags and standard buildPhase#238029

Closed
ghost wants to merge 2 commits intostagingfrom
unknown repository
Closed

mtrace: use makeFlags and standard buildPhase#238029
ghost wants to merge 2 commits intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jun 16, 2023

Description of changes

This commit causes glibc/mtrace.nix to use makeFlags and the standard buildPhase in order to be more overrideAttrs-friendly.

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.

Adam Joseph added 2 commits June 15, 2023 20:14
This commit allows to include `makeFlags` in a glibc derivation
without clobbering the flags from `common.nix`
This commit causes `glibc/mtrace.nix` to use `makeFlags` and the
standard `buildPhase` in order to be more overrideAttrs-friendly.
@ofborg ofborg bot requested review from Ma27 and edolstra June 16, 2023 04:59
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 16, 2023
Copy link
Copy Markdown
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

This breaks mtrace for me with exec format error because of an empty shebang in ./result/bin/mtrace.

Also, this can be targeted against master directly.

@ghost ghost closed this Aug 5, 2023
@ghost ghost deleted the pr/glibc/mtrace/use-standard-builder branch August 5, 2023 20:57
This pull request was closed.
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 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant