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

treewide: move fixDarwinDylibNames to nativeBuildInputs #100388

Merged
merged 2 commits into from Oct 21, 2020

Conversation

@thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Oct 13, 2020

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.
Copy link
Member

@LnL7 LnL7 left a comment

Looks good to me otherwise.

];

propagatedNativeBuildInputs =
Copy link
Member

@LnL7 LnL7 Oct 13, 2020

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

ggreif added a commit to ggreif/nixpkgs that referenced this issue Oct 14, 2020
primeos added a commit that referenced this issue Oct 16, 2020
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 FRidh commented Oct 20, 2020

needs a rebase

This hook runs at build time and depends on executing
install_name_tool from binutils.
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 thefloweringash force-pushed the darwin-dylib-names-hook branch from 4175101 to 5b5d38a Oct 21, 2020
@thefloweringash
Copy link
Member Author

@thefloweringash thefloweringash commented Oct 21, 2020

Rebased!

LnL7
LnL7 approved these changes Oct 21, 2020
@LnL7 LnL7 merged commit bb0b872 into NixOS:staging Oct 21, 2020
19 checks passed
@thefloweringash thefloweringash deleted the darwin-dylib-names-hook branch Oct 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants