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

Fix MacOS builds on Big Sur+ #1020

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix MacOS builds on Big Sur+ #1020

wants to merge 4 commits into from

Conversation

cidkidnix
Copy link
Member

GHC 8.6.5 needs a patch to properly load frameworks which is what the r-p bump does

We don't set the NIX_PATH in the nix-shell command env which ends up making nix-shell fall back to system-bash which we shouldn't rely on existing (or working properly). The haskell portion of this sets NIX_PATH to nixpkgs to properly pull bash from nixpkgs

depends on reflex-frp/reflex-platform#810

I have:

  • Based work on latest develop branch
  • Followed the contribution guide
  • Looked for lint in my changes with hlint . (lint found code you did not write can be left alone)
  • Run the test suite: $(nix-build -A selftest --no-out-link)
  • Updated the changelog
  • (Optional) Run CI tests locally: nix-build release.nix -A build.x86_64-linux --no-out-link (or x86_64-darwin on macOS)

Comment on lines +336 to +337
nixShellRunProc cfg = let p = setDelegateCtlc True $ proc nixShellPath $ runNixShellConfig cfg
in setEnvOverride (\oldMap -> (Map.union (Map.fromList (_nixShellConfig_env cfg)) oldMap)) p
Copy link

@parenthetical parenthetical Feb 8, 2023

Choose a reason for hiding this comment

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

You can do

nixShellRunProc cfg = 
    setEnvOverride (\oldMap -> (Map.union (Map.fromList (_nixShellConfig_env cfg)) oldMap))
    $ setDelegateCtlc True
    $ proc nixShellPath
    $ runNixShellConfig cfg

@mankyKitty
Copy link
Collaborator

@cidkidnix This can be updated to point to reflex-platform develop.

@mankyKitty mankyKitty marked this pull request as ready for review February 28, 2023 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants