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

treewide: move fixDarwinDylibNames to nativeBuildInputs #100388

Merged
merged 2 commits into from Oct 21, 2020
Merged

treewide: move fixDarwinDylibNames to nativeBuildInputs #100388

merged 2 commits into from Oct 21, 2020

Conversation

thefloweringash
Copy link
Member

Motivation for this change

Hopefully simple cleanup. I discovered some inconsistencies when cross compiling where install_name_tool has a target prefix, and checked through the uses in the entire tree.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 13, 2020
@thefloweringash thefloweringash force-pushed the darwin-dylib-names-hook branch 3 times, most recently from 837c8e8 to 9488d79 Compare October 13, 2020 07:24
LnL7
LnL7 suggested changes Oct 13, 2020
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Looks good to me otherwise.

pkgs/tools/security/sudolikeaboss/default.nix Outdated
];

propagatedNativeBuildInputs =
Copy link
Member

@LnL7 LnL7 Oct 13, 2020 •
edited

Choose a reason for hiding this comment

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

This should never be propagated, that makes it impossible to build libraries with rpath or executable relative references when this is a dependency.

@ggreif ggreif mentioned this pull request Oct 14, 2020
Merged
10 tasks
primeos added a commit that referenced this pull request Oct 16, 2020
@primeos
Merge pull request #99984 from ggreif/darwin-llvm11
86a4a50 
llvmPackages_11: 11.0.0rc5 -> 11.0.0 and various fixes/improvements:
- llvmPackages_11 now compiles on Darwin
- libcxx now compiles on Linux
- Ported #91293 to 11.0.0
- Try to anticipate #100388
@FRidh
Copy link
Member

FRidh commented Oct 20, 2020

needs a rebase

@thefloweringash
treewide: move fixDarwinDylibNames to nativeBuildInputs
722d02a 
This hook runs at build time and depends on executing
install_name_tool from binutils.
@thefloweringash
sudolikeaboss: remove input propagation and unused hook
5b5d38a 
This package is a leaf that exports no libraries, so propagating its
inputs should have no effect.

The fixDarwinDylibNames hook only applies to *.dylib files, which this
package does not contain.
@thefloweringash
Copy link
Member Author

Rebased!

@LnL7 LnL7 merged commit bb0b872 into NixOS:staging Oct 21, 2020
@thefloweringash thefloweringash deleted the darwin-dylib-names-hook branch October 23, 2020 04:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @FRidh @LnL7