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

haskell-generic-builder: Add extra framework dirs #40442

Merged
merged 1 commit into from May 18, 2018

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented May 13, 2018

Motivation for this change

Just like with the other --extra-* flags, cc/ld-wrapper already handles this, but we need to make Cabal aware so that the haskell builds have the correct metadata.

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.

CC @ElvishJerricco

@@ -242,6 +242,9 @@ stdenv.mkDerivation ({
if [ -d "$p/lib" ]; then
configureFlags+=" --extra-lib-dirs=$p/lib"
fi
if [[ -d "$p/Library/Frameworks" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

So sometimes this is just in /Frameworks IIRC

Copy link
Member Author

Choose a reason for hiding this comment

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

Then cc-wrapper needs to be changed too :D.

Copy link
Member

Choose a reason for hiding this comment

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

Which is preferred? I think Library & System are often used by Apple kind if like usr is on Linux. At least it seems like we can move them to all be /Frameworks

Copy link
Member Author

Choose a reason for hiding this comment

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

I have no idea. CC @NixOS/darwin-maintainers. I think it best we merge this and then sort out all that later. But thanks for making me aware :).

Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
@Ericson2314
Copy link
Member Author

Ericson2314 commented May 18, 2018

It's been a few days, and I very much need to do more work that depends on this. I'll merge, not rebase, to staging so @peti can merge the same commit to haskell-updates after the fact to expedite this hitting master if he wishes.

@Ericson2314 Ericson2314 merged commit 2241ded into NixOS:staging May 18, 2018
@Ericson2314 Ericson2314 deleted the cabal-frameworks branch May 18, 2018 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants