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

cmake: fix hook for multiple outputs on darwin #33382

Merged
merged 2 commits into from Jan 7, 2018
Merged

cmake: fix hook for multiple outputs on darwin #33382

merged 2 commits into from Jan 7, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Jan 3, 2018

When there's a lib output libraries won't be intalled to $prefix causing
output cycles.

Motivation for this change

Fixes issues like #33341

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Jan 3, 2018
@LnL7
cmake: fix INSTALL_NAME_DIR for darwin libraries
6f10cfc 
When there's a lib output libraries won't be intalled to $prefix causing
output cycles.
@LnL7
brotli: remove darwin cmake fix
dc2ae3a
@LnL7 LnL7 merged commit 84f9736 into NixOS:staging Jan 7, 2018
@LnL7 LnL7 deleted the darwin-cmake-outputs branch January 7, 2018 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orivej orivej orivej approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @orivej @GrahamcOfBorg